From 480fd0e7d496b0fb3f4a8dc0bc1e8fbe1deae846 Mon Sep 17 00:00:00 2001
From: Hideki Shimizu <shimiz@cns.s.u-tokyo.ac.jp>
Date: Wed, 22 Jan 2020 12:21:45 +0900
Subject: [PATCH] [debug] correct invalid time stamp

---
 .gitignore                                   |   1 +
 include/TSMerger.h                           |  40 +++++++-----
 include/{ts_object.h => TSObject.h}          |   0
 include/{ts_tree_object.h => TSTreeObject.h} |  10 ++-
 include/classdef.h                           |   6 ++
 include/print.h                              |   5 ++
 lib/Dict_rdict.pcm                           | Bin 2029 -> 2234 bytes
 lib/libclass.so                              | Bin 80180 -> 80180 bytes
 make_dict.py                                 |   5 --
 makefile                                     |   2 +-
 src/main.cpp                                 |  62 +++++++++++++++----
 11 files changed, 97 insertions(+), 34 deletions(-)
 rename include/{ts_object.h => TSObject.h} (100%)
 rename include/{ts_tree_object.h => TSTreeObject.h} (92%)

diff --git a/.gitignore b/.gitignore
index 084a2be..8c6a4dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ objs
 run
 *.root
 dict/*
+tmp
diff --git a/include/TSMerger.h b/include/TSMerger.h
index 0b52d05..afb200d 100644
--- a/include/TSMerger.h
+++ b/include/TSMerger.h
@@ -6,6 +6,9 @@
 #include <functional>
 #include <string>
 
+
+#include "Print.h"
+
 #include <TROOT.h>
 #include <TTree.h>
 #include <TFile.h>
@@ -46,9 +49,9 @@ class TSMerger
             while ( ! obj1.end() || ! obj2.end() ) {
                 if ((obj1.getTimeStamp() > obj2.getTimeStamp() || obj1.end()) && !obj2.end()) {
                     ++obj2;
-                    obj1.set_null();
+                    obj1.unset();
                 } else if ((obj1.getTimeStamp() < obj2.getTimeStamp() || obj2.end()) && !obj1.end()) {
-                    obj2.set_null();
+                    obj2.unset();
                     ++obj1;
                 } else if ( !obj1.end() && !obj2.end()) {
                     ++obj1;
@@ -71,9 +74,9 @@ class TSMerger
             while ( ! obj1.end() || ! obj2.end() ) {
                 if ((obj1.getTimeStamp() > obj2.getTimeStamp() || obj1.end()) && !obj2.end()) {
                     ++obj2;
-                    obj1.set_null();
+                    obj1.unset();
                 } else if ((obj1.getTimeStamp() < obj2.getTimeStamp() || obj2.end()) && !obj1.end()) {
-                    obj2.set_null();
+                    obj2.unset();
                     ++obj1;
                 } else if ( !obj1.end() && !obj2.end()) {
                     ++obj1;
@@ -100,7 +103,7 @@ class TSObjectMerger
 
         TFile* output_file = nullptr;
         TTree* output = nullptr;
-        std::string branch_name = "tree";
+        std::string branch_name = "merged";
 
     public : 
         TSObjectMerger( const Object1 &t1, const Object2 &t2 ){
@@ -131,24 +134,31 @@ class TSObjectMerger
          */
         template<class TSObjectMergerCondition>
         void merge(TSObjectMergerCondition condition) {
-            bool younger = 0;
             obj1.reset();
             obj2.reset();
             while ( ! obj1.end() || ! obj2.end() ) {
-                if ((obj1.getTimeStamp() > obj2.getTimeStamp() || obj1.end()) && !obj2.end()) {
+                if ((obj1.getTimeStamp() > obj2.getTimeStamp() || obj1.end() ) && !obj2.end()) {
+                    obj1.unset();
+                    obj2.set();
+                    if ( condition.wonnow(*obj1.get(), *obj2.get(), obj3) )
+                        output->Fill();
                     ++obj2;
-                    obj1.set_null();
-                    younger = 1;
-                } else if ((obj1.getTimeStamp() < obj2.getTimeStamp() || obj2.end()) && !obj1.end()) {
-                    obj2.set_null();
+                } else if ((obj1.getTimeStamp() < obj2.getTimeStamp() || obj2.end() ) && !obj1.end()) {
+                    obj2.unset();
+                    obj1.set();
+                    if ( condition.wonnow(*obj1.get(), *obj2.get(), obj3) )
+                        output->Fill();
                     ++obj1;
-                    younger = 0;
-                } else if ( !obj1.end() && !obj2.end()) {
+                } else if ( obj1.getTimeStamp() == obj2.getTimeStamp() && !obj1.end() && !obj2.end()) {
+                    obj1.set();
+                    obj2.set();
+                    if ( condition.wonnow(*obj1.get(), *obj2.get(), obj3) )
+                        output->Fill();
                     ++obj1;
                     ++obj2;
                 }
-                if ( condition.wonnow(*obj1.get(), *obj2.get(), obj3, younger) )
-                    output->Fill();
+                //if ( condition.wonnow(*obj1.get(), *obj2.get(), obj3) )
+                //    output->Fill();
             }
             std::cout << "TSObjectMerger::Notes. Merge completed." << std::endl;
             output->Write();
diff --git a/include/ts_object.h b/include/TSObject.h
similarity index 100%
rename from include/ts_object.h
rename to include/TSObject.h
diff --git a/include/ts_tree_object.h b/include/TSTreeObject.h
similarity index 92%
rename from include/ts_tree_object.h
rename to include/TSTreeObject.h
index 6047092..b683443 100644
--- a/include/ts_tree_object.h
+++ b/include/TSTreeObject.h
@@ -1,7 +1,7 @@
 #ifndef TS_TREE_OBJECT_H
 #define TS_TREE_OBJECT_H
 
-#include "ts_object.h"
+#include "TSObject.h"
 
 template<class T>
 class TSTreeObject : public TSObject
@@ -27,10 +27,16 @@ class TSTreeObject : public TSObject
         unsigned long long getTimeStamp() const { return ts_obj->ts; }
 
         T* get() const { return ts_obj; }
-        void set_null() {
+
+        void unset() {
             ts_obj->set_null();
             ts_obj->status = false;
         }
+        void set() {
+            ts_obj->status = true;
+        }
+
+
         void reset() { i=0; fTree->GetEntry(i); }
         Bool_t end() { return !(i < n); }
         Bool_t begin() { return i == 0; }
diff --git a/include/classdef.h b/include/classdef.h
index 1ca123d..d759677 100644
--- a/include/classdef.h
+++ b/include/classdef.h
@@ -55,8 +55,14 @@ class MergedData  : public TObject
 
     public : 
         ULong64_t ts;
+        ULong64_t o1ts, o2ts;
         Double_t x, y;
+        Double_t xx, yy;
         Int_t l, m, n;
+
+        Bool_t o1, o2;
+
+        UShort_t id = 0;
         Bool_t status = 0;
 
         ClassDef(MergedData, 1);
diff --git a/include/print.h b/include/print.h
index 335b466..74a7be6 100644
--- a/include/print.h
+++ b/include/print.h
@@ -1,3 +1,6 @@
+#ifndef PRINT_H
+#define PRINT_H
+
 #include <iostream>
 #include <vector>
 #include <map>
@@ -34,3 +37,5 @@ template <class Head, class... Tail> void print(Head&& head, Tail&&... tail) {
     cout << head << " ";
     print(forward<Tail>(tail)...);
 }
+
+#endif
diff --git a/lib/Dict_rdict.pcm b/lib/Dict_rdict.pcm
index aa80a9e34c13761d32222168209009f50cee7ac0..411888e589ded27b0585a54d57fbd85188c48824 100644
GIT binary patch
delta 1634
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
U2|Xm^1Rly#0yjxE-ZUHd7ec+|fdBvi

delta 1439
zcmZ8hdpMM79Q|f#CZh5b8OB{mC4@#ZSj<#zm1!uUi`%#~xg<>Jb4fz9Oi@c0gJCj^
z7@J|o4y%$&+KgED+h%iFLNl|A(P#FLc6*=aywCePzw@5+->Fxa+lGz^4UGhVPnQ4y
z@B;wE9E4}k8w&vj0VfSz{t*5>uxjnV?HG*0bWQeeirFWWkpPeYY)Fp#1@h5=spJpj
z0|3+$2<7ZtMLmd?tN@q;#Nr@G)&Kwx1penHC!Mt6q#)XmQz-~b@T~J@Q)xh?0K~vL
zPj`lT;<v9;$fe=7E~vJnPc*DG`)TUw#6tD${d9aVU+GY@mu8N?epi!$AY;{npnw`K
z9B)aK@)9}Kh2h3+Mw41(!Y7**WCA{P_H|`>m+p2n%^?YVqo5-YzEtn|#T5s`Wg%VD
z9;B|!ou|Dl0&P*_n1%}7v1jK;u?w>MM|a;Fm#q>R9Ir1_6$Ys@n3T6J-wELcBzi`1
z2XTQ%FJso`v@(6vvh<9$fF5M(Y2Je)+%*bYvFx?c7<QpqV{bYCa7J5S@fD`FV{fW8
zAEU7>jGaZFOVK&^F!ENZMLgbudPV9CU86hX0gnc@?Q(OhDkBq8VZ(W8Q^cILX1Jjl
zVVOt5_SX%_R;0SJ)Z}A?aMUNaF(*z<p6s1$oh#`#2Qx3lUBnEB&L7E$#+xMzDDS!%
zgq_!QEeFKAm_dH2CE~GJkRjNC-sZJaOc-8|Ad##%@_N=5)W{n{MJ*T42B*~Z4qanu
zft&@wN)L0S<DX8h@qPZN+oO4E^7PHuc}_P~Tv~IPJaWA)xBOo2avJ4s!=ATVzb7s6
zHho@0O)XnC7Gc6|*!63HVflw{pBhEvV5oaqEV;H+n`~@9uF+Ym5$8^tx?EVy3E>0<
z`Sem?$R1)NWASO5ry<wTW&a>w%pL@%?k`SE3JLC3nXDHSgR9q^t1gT6sUAtFNoF}?
zVzH+BSoCLu;k-!nL?XGf-32|(HH!0?&mA)2{GfSM$wZ~Pg%!7|`Pcl<u{B6~ZA=A1
z{4QR6qiA^d*woU>KHWk^!7D+vXHy`HfXRy9_5PN5GW&I3bWm>ah%^1iA_uU`HIOe<
z4o8xD?fJf7C85#@D+<1AX8pdzdqyLDX};KCeIhaBlu{<U){Pl`xO!U0YB3&dqgEYt
zHEnad)$|#^jG^lWETR3uu#8%)@yMk+=9$6oMI!+#I!*~(IhEL_&&l%5`eEuZ_A%z*
z{0nZ(?7KNeqTEc1oa@YmWRQ*4)4yFA>i?K2ql~(iFEtQ5TV-|f@*Un!^;+>h>Lq&_
z3FJL1t*U)SYSIJd)?$XVXI#aFh9^^|e^!yayTcnkl_u(!tH(U5zb@jM@qE2AP0XzZ
zpGVmEgK=TP2KpK+j6IXxJVZ51ZeY=yhUD>2eG{I$SdGu7e>908f~vLh##wCbnte3#
zR?_+nlL^{nvFfYawJ72-vWbRan`e-FUcBrSN485GvhN_VAYNHMibk${bNqnwD$}@W
zlVLaZe%&L6?YR9MiNTdi53oz?SGpKx>XKu()u-$zzDF2Qlpz+K{D6G?1a^QETc>Y2
zBJO)kQ$e~PE?E29qom_ZirF7&8u%1H8GL2_Kvz%{)2@28fFz(;E9Nd)4s;t%=zshu
zA{H3)D+5mE+y9E{7^W$|DQi6fg6mT4?GG)Xy77|q6H-z__8a}QDS+w#cipnlSKmwK
zX6lyBhSV;&u7q>g;NYrMG2BivOF9i6NOeMJe_K&FiQud0ekCZ+<3D*{{msAew%CD{
X=w!e4CgK^Cp(X>RBj%#b?*d-{KHz=G

diff --git a/lib/libclass.so b/lib/libclass.so
index 46f80454ce26f2003f22ce33e5751fc1669769ee..08052ffc6c72d8ec85a60550d3b5d67597891533 100755
GIT binary patch
delta 7972
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

delta 8034
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
QJbCI@N}zN2>HhWq2N=ycTL1t6

diff --git a/make_dict.py b/make_dict.py
index 43e2a88..a40c707 100644
--- a/make_dict.py
+++ b/make_dict.py
@@ -8,13 +8,8 @@ else :
 
 files = [f for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
 
-
-
 import re
 
-
-
-
 classes = []
 
 for f in files :
diff --git a/makefile b/makefile
index ddfc5b0..23c31a2 100644
--- a/makefile
+++ b/makefile
@@ -13,7 +13,7 @@
 
 TARGET   = run
 #INCLUDES = -I./include
-INCLUDES = -I./include -I./lib/src/class
+INCLUDES = -I./include
 SRC_DIR = src
 #NOMAKEDIR= .git% data% doc% bin% src/bin% tmp%
 OBJDIR = objs
diff --git a/src/main.cpp b/src/main.cpp
index 43c4da8..eef5ab6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,9 +1,9 @@
-#include "ts_object.h"
+#include "TSObject.h"
 #include "TSMerger.h"
-#include "ts_tree_object.h"
+#include "TSTreeObject.h"
 
 
-#include "print.h"
+#include "Print.h"
 #include "utils.h"
 
 #include "classdef.h"
@@ -30,12 +30,11 @@ class Condition
     }
 };
 
-
 template<class T1, class T2, class merged>
 class TSObjectMergerCondition
 {
     public :
-    bool wonnow(const T1 &o1, const T2 &o2, merged &Obj, bool younger){
+    bool wonnow(const T1 &o1, const T2 &o2, merged &Obj){
 
         // Define merged Data
         Obj.l = o1.l;
@@ -44,13 +43,54 @@ class TSObjectMergerCondition
         Obj.x = o2.x;
         Obj.y = o2.y;
 
-        // Necessary
-        Obj.ts = ! younger ? o1.ts : o2.ts;
+
+
+
+        Obj.o1 = o1.status;
+        Obj.o2 = o2.status;
+        Obj.o1ts = o1.ts;
+        Obj.o2ts = o2.ts;
+
+
+
+        // Do not change here
+        Obj.id = 2 * o2.status + o1.status;
+        switch (Obj.id){
+            case 1 :
+                Obj.ts = o1.ts;
+                break;
+            case 2 :
+                Obj.ts = o2.ts;
+                break;
+            case 3 :
+                Obj.ts = o2.ts;
+                break;
+            case 0 :
+                return false;
+                break;
+        }
+        /*
+         *  o1   o2   |  2*o2 + o1
+         *  --------  |  ---------
+         *  1    1    |     3      
+         *  1    0    |     1      
+         *  0    1    |     2      
+         *  0    0    |     0      
+         *
+         * id = 0 : invalid data
+         * id = 1 : o1 data
+         * id = 2 : o2 data
+         * id = 3 : coincidence
+         *
+         */
+
+        Obj.xx = o2.x * Obj.ts;
+        Obj.yy = o2.y * Obj.ts;
 
         // Condition
-        Bool_t condition = std::abs((long long)(o1.ts - o2.ts)) < 4 ;
-        Obj.status = condition;
-        return  condition;
+        //Bool_t condition = std::abs((long long)(o1.ts - o2.ts)) < 5  ;
+        Bool_t condition = true;
+        return condition;
     }
 };
 
@@ -91,7 +131,7 @@ int main(int argc, char **argv)
     typedef TSObjectMergerCondition<DataContainerA, DataContainerB, MergedData> TSMC;
     TSMC condition;
     TSObjectMerger< TSTreeObject<DataContainerA>, TSTreeObject<DataContainerB>, MergedData > merger(t1, t2);
-    merger.setOutputTree("merged", "tree");
+    merger.setOutputTree("merged", "br");
     merger.merge<TSMC>(condition);
 
     end = std::chrono::system_clock::now();
-- 
GitLab