From 1b6ebb06c080d082e8efcb3c9159f6474208a346 Mon Sep 17 00:00:00 2001
From: Kamil Sedlak <kamil.sedlak@psi.ch>
Date: Tue, 13 Dec 2011 08:56:25 +0000
Subject: [PATCH] 13.12.2011  Kamil Sedlak

musrSim:

1) implemented volume type "boxbox" (box with a box hole)
2) suppressing optical photon output in case optical photons are not simulated

 musrSimAna:
3)  musrWriteDump modified (needed only for a dump-file creation)
---
 musrSimAna/musrWriteDump.cxx    |   3 +-
 src/musrDetectorConstruction.cc |  13 ++
 src/musrRootOutput.cc           | 265 ++++++++++++++++----------------
 3 files changed, 149 insertions(+), 132 deletions(-)

diff --git a/musrSimAna/musrWriteDump.cxx b/musrSimAna/musrWriteDump.cxx
index 0ca9982..535990a 100644
--- a/musrSimAna/musrWriteDump.cxx
+++ b/musrSimAna/musrWriteDump.cxx
@@ -64,7 +64,7 @@ void musrWriteDump::send_to_dump(unsigned int channel, Long64_t tdcBin, int flus
       it5 = it4; it5++;
       it6 = it5; it6++;
       double prob = (float)rand()/RAND_MAX;
-      std::cout<<"IIIIIIIIIIIIIIII prob= "<<prob<<";       MAX_TIME_JITTER= "<<MAX_TIME_JITTER<<std::endl;
+      //     std::cout<<"IIIIIIIIIIIIIIII prob= "<<prob<<";       MAX_TIME_JITTER= "<<MAX_TIME_JITTER<<std::endl;
       if ( ((it2->first)-(it1->first)) <= MAX_TIME_JITTER) { if (prob<0.6) {it = it2;} }
       if ( ((it3->first)-(it1->first)) <= MAX_TIME_JITTER) { if (prob<0.5) {it = it3;} }
       if ( ((it4->first)-(it1->first)) <= MAX_TIME_JITTER) { if (prob<0.4) {it = it4;} }
@@ -86,6 +86,7 @@ void musrWriteDump::send_to_dump(unsigned int channel, Long64_t tdcBin, int flus
     write_to_dump(ch_num, tdcDifference, false);
     //	    std::cout<<"Setrideno: ch="<<it->first<<", "<<it->second<<std::endl;
     kamilHitMultimap.erase(it);
+    if (tdcDifference<=MAX_TIME_JITTER) tdcBin0 -= TDC_BIT_RANGE;
   }
 }
 
diff --git a/src/musrDetectorConstruction.cc b/src/musrDetectorConstruction.cc
index da352d8..de571a0 100644
--- a/src/musrDetectorConstruction.cc
+++ b/src/musrDetectorConstruction.cc
@@ -490,6 +490,19 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct()  {
 	  G4Tubs* solidOuterDetTube2 = new G4Tubs("SolidOuterDetTube2",x4*mm,x5*mm,x6*mm,x7*deg,x8*deg);
 	  solid =  new G4SubtractionSolid(solidName, solidOuterDetTube2, solidInnerDetBox2);
 	}
+	else if (strcmp(tmpString2,"boxbox")==0){
+	  // Create a box, from which center a box is cut out.
+	  // x1,x2,x3=box half-widths of the inner box (opening); x4,x5,x6 define the big box.
+	  sscanf(&line[0],"%*s %*s %*s %s %lf %lf %lf %lf %lf %lf %s",
+		 name,&x1,&x2,&x3,&x4,&x5,&x6,material);
+	  sscanf(&line[0],"%*s %*s %*s %*s %*g %*g %*g %*g %*g %*g %*s %lf %lf %lf %s %s %s %d %s",
+		 &posx,&posy,&posz,mothersName,rotMatrix,sensitiveDet,&volumeID,actualFieldName);
+	  solidName+=name;
+	  G4double roundingErr=0.01*mm;  // to avoid some displaying problems of the subtracted volumes
+	  G4Box* solidInnerDetBox = new G4Box("SolidInnerDetBox",x1*mm+roundingErr,x2*mm+roundingErr,x3*mm+roundingErr);
+	  G4Box* solidOuterDetBox = new G4Box("SolidOuterDetBox",x4*mm,x5*mm,x6*mm);
+	  solid =  new G4SubtractionSolid(solidName, solidOuterDetBox, solidInnerDetBox);
+	}
 	else if (strcmp(tmpString2,"GPSforward")==0){
 	  // Create a box, from which a cone is cut out:
 	  // x1, x2, x3 = box half-widths; 
diff --git a/src/musrRootOutput.cc b/src/musrRootOutput.cc
index 205a815..8e40749 100644
--- a/src/musrRootOutput.cc
+++ b/src/musrRootOutput.cc
@@ -232,9 +232,11 @@ void musrRootOutput::BeginOfRunAction() {
   if (store_posIniMomX)   {rootTree->Branch("posIniMomX",&posIniMomx,"posIniMomX/D");}
   if (store_posIniMomY)   {rootTree->Branch("posIniMomY",&posIniMomy,"posIniMomY/D");}
   if (store_posIniMomZ)   {rootTree->Branch("posIniMomZ",&posIniMomz,"posIniMomZ/D");}
-  if (store_nOptPhot)     {rootTree->Branch("nOptPhot",&nOptPhot,"nOptPhot/I");}
-  if (store_nOptPhotDet)  {rootTree->Branch("nOptPhotDet",&nOptPhotDet,"nOptPhotDet/I");}
-  if (store_phot_time)    {rootTree->Branch("phot_time",&phot_time,"phot_time[nOptPhotDet]/D");}
+  if (musrParameters::boolG4OpticalPhotons) {
+    if (store_nOptPhot)     {rootTree->Branch("nOptPhot",&nOptPhot,"nOptPhot/I");}
+    if (store_nOptPhotDet)  {rootTree->Branch("nOptPhotDet",&nOptPhotDet,"nOptPhotDet/I");}
+    if (store_phot_time)    {rootTree->Branch("phot_time",&phot_time,"phot_time[nOptPhotDet]/D");}
+  }
   //  if (store_globalTime)   {rootTree->Branch("globalTime",&globalTime,"globalTime/D");}
   //  if (store_fieldValue)   {rootTree->Branch("fieldValue",&fieldValue,"fieldValue/D");}
   if (store_fieldNomVal)  {
@@ -296,135 +298,136 @@ void musrRootOutput::BeginOfRunAction() {
     rootTree->Branch("save_poly",&save_poly,"save_poly[save_n]/D");
     rootTree->Branch("save_polz",&save_polz,"save_polz[save_n]/D");
   }
-  
-  if (store_odet_ID || store_odet_nPhot || store_odet_nPhotPrim || store_odet_timeFirst || store_odet_timeSecond || 
-      store_odet_timeThird || store_odet_timeA || store_odet_timeB || store_odet_timeC || store_odet_timeD || 
-      store_odet_timeMean || store_odet_timeLast || store_odet_timeCFD || store_odet_amplCFD || store_odet_timeC1)
-                              {rootTree->Branch("odet_n",&odet_n,"odet_n/I");}
-  if (store_odet_ID)          {rootTree->Branch("odet_ID",&odet_ID,"odet_ID[odet_n]/I");}
-  if (store_odet_nPhot)       {rootTree->Branch("odet_nPhot",&odet_nPhot,"odet_nPhot[odet_n]/I");}
-  if (store_odet_nPhotPrim)   {rootTree->Branch("odet_nPhotPrim",&odet_nPhotPrim,"odet_nPhotPrim[odet_n]/I");}
-  if (store_odet_timeFirst)   {rootTree->Branch("odet_timeFirst",&odet_timeFirst,"odet_timeFirst[odet_n]/D");}
-  if (store_odet_timeSecond)  {rootTree->Branch("odet_timeSecond",&odet_timeSecond,"odet_timeSecond[odet_n]/D");}
-  if (store_odet_timeThird)   {rootTree->Branch("odet_timeThird",&odet_timeThird,"odet_timeThird[odet_n]/D");}
-  if (store_odet_timeA)       {rootTree->Branch("odet_timeA",&odet_timeA,"odet_timeA[odet_n]/D");}
-  if (store_odet_timeB)       {rootTree->Branch("odet_timeB",&odet_timeB,"odet_timeB[odet_n]/D");}
-  if (store_odet_timeC)       {rootTree->Branch("odet_timeC",&odet_timeC,"odet_timeC[odet_n]/D");}
-  if (store_odet_timeD)       {rootTree->Branch("odet_timeD",&odet_timeD,"odet_timeD[odet_n]/D");}
-  if (store_odet_timeMean)       {rootTree->Branch("odet_timeMean",&odet_timeMean,"odet_timeMean[odet_n]/D");}
-  if (store_odet_timeLast)    {rootTree->Branch("odet_timeLast",&odet_timeLast,"odet_timeLast[odet_n]/D");}
-  if (store_odet_timeCFD)     {rootTree->Branch("odet_timeCFD",&odet_timeCFD,"odet_timeCFD[odet_n]/D");}
-  if (store_odet_amplCFD)     {rootTree->Branch("odet_amplCFD",&odet_amplCFD,"odet_amplCFD[odet_n]/D");}
-  if (store_odet_timeCFDarray)     {
-    rootTree->Branch("odet_timeCFD100",&odet_timeCFD100,"odet_timeCFD100[odet_n]/D");
-    rootTree->Branch("odet_timeCFD101",&odet_timeCFD101,"odet_timeCFD101[odet_n]/D");
-    rootTree->Branch("odet_timeCFD102",&odet_timeCFD102,"odet_timeCFD102[odet_n]/D");
-    rootTree->Branch("odet_timeCFD103",&odet_timeCFD103,"odet_timeCFD103[odet_n]/D");
-    rootTree->Branch("odet_timeCFD104",&odet_timeCFD104,"odet_timeCFD104[odet_n]/D");
-    rootTree->Branch("odet_timeCFD105",&odet_timeCFD105,"odet_timeCFD105[odet_n]/D");
-    rootTree->Branch("odet_timeCFD106",&odet_timeCFD106,"odet_timeCFD106[odet_n]/D");
-    rootTree->Branch("odet_timeCFD107",&odet_timeCFD107,"odet_timeCFD107[odet_n]/D");
-    rootTree->Branch("odet_timeCFD108",&odet_timeCFD108,"odet_timeCFD108[odet_n]/D");
-    rootTree->Branch("odet_timeCFD109",&odet_timeCFD109,"odet_timeCFD109[odet_n]/D");
-    rootTree->Branch("odet_timeCFD110",&odet_timeCFD110,"odet_timeCFD110[odet_n]/D");
-    rootTree->Branch("odet_timeCFD111",&odet_timeCFD111,"odet_timeCFD111[odet_n]/D");
-    rootTree->Branch("odet_timeCFD112",&odet_timeCFD112,"odet_timeCFD112[odet_n]/D");
-    rootTree->Branch("odet_timeCFD200",&odet_timeCFD200,"odet_timeCFD200[odet_n]/D");
-    rootTree->Branch("odet_timeCFD201",&odet_timeCFD201,"odet_timeCFD201[odet_n]/D");
-    rootTree->Branch("odet_timeCFD202",&odet_timeCFD202,"odet_timeCFD202[odet_n]/D");
-    rootTree->Branch("odet_timeCFD203",&odet_timeCFD203,"odet_timeCFD203[odet_n]/D");
-    rootTree->Branch("odet_timeCFD204",&odet_timeCFD204,"odet_timeCFD204[odet_n]/D");
-    rootTree->Branch("odet_timeCFD205",&odet_timeCFD205,"odet_timeCFD205[odet_n]/D");
-    rootTree->Branch("odet_timeCFD206",&odet_timeCFD206,"odet_timeCFD206[odet_n]/D");
-    rootTree->Branch("odet_timeCFD207",&odet_timeCFD207,"odet_timeCFD207[odet_n]/D");
-    rootTree->Branch("odet_timeCFD208",&odet_timeCFD208,"odet_timeCFD208[odet_n]/D");
-    rootTree->Branch("odet_timeCFD209",&odet_timeCFD209,"odet_timeCFD209[odet_n]/D");
-    rootTree->Branch("odet_timeCFD210",&odet_timeCFD210,"odet_timeCFD210[odet_n]/D");
-    rootTree->Branch("odet_timeCFD211",&odet_timeCFD211,"odet_timeCFD211[odet_n]/D");
-    rootTree->Branch("odet_timeCFD212",&odet_timeCFD212,"odet_timeCFD212[odet_n]/D");
-    rootTree->Branch("odet_timeCFD300",&odet_timeCFD300,"odet_timeCFD300[odet_n]/D");
-    rootTree->Branch("odet_timeCFD301",&odet_timeCFD301,"odet_timeCFD301[odet_n]/D");
-    rootTree->Branch("odet_timeCFD302",&odet_timeCFD302,"odet_timeCFD302[odet_n]/D");
-    rootTree->Branch("odet_timeCFD303",&odet_timeCFD303,"odet_timeCFD303[odet_n]/D");
-    rootTree->Branch("odet_timeCFD304",&odet_timeCFD304,"odet_timeCFD304[odet_n]/D");
-    rootTree->Branch("odet_timeCFD305",&odet_timeCFD305,"odet_timeCFD305[odet_n]/D");
-    rootTree->Branch("odet_timeCFD306",&odet_timeCFD306,"odet_timeCFD306[odet_n]/D");
-    rootTree->Branch("odet_timeCFD307",&odet_timeCFD307,"odet_timeCFD307[odet_n]/D");
-    rootTree->Branch("odet_timeCFD308",&odet_timeCFD308,"odet_timeCFD308[odet_n]/D");
-    rootTree->Branch("odet_timeCFD309",&odet_timeCFD309,"odet_timeCFD309[odet_n]/D");
-    rootTree->Branch("odet_timeCFD310",&odet_timeCFD310,"odet_timeCFD310[odet_n]/D");
-    rootTree->Branch("odet_timeCFD311",&odet_timeCFD311,"odet_timeCFD311[odet_n]/D");
-    rootTree->Branch("odet_timeCFD312",&odet_timeCFD312,"odet_timeCFD312[odet_n]/D");
-    rootTree->Branch("odet_timeCFD400",&odet_timeCFD400,"odet_timeCFD400[odet_n]/D");
-    rootTree->Branch("odet_timeCFD401",&odet_timeCFD401,"odet_timeCFD401[odet_n]/D");
-    rootTree->Branch("odet_timeCFD402",&odet_timeCFD402,"odet_timeCFD402[odet_n]/D");
-    rootTree->Branch("odet_timeCFD403",&odet_timeCFD403,"odet_timeCFD403[odet_n]/D");
-    rootTree->Branch("odet_timeCFD404",&odet_timeCFD404,"odet_timeCFD404[odet_n]/D");
-    rootTree->Branch("odet_timeCFD405",&odet_timeCFD405,"odet_timeCFD405[odet_n]/D");
-    rootTree->Branch("odet_timeCFD406",&odet_timeCFD406,"odet_timeCFD406[odet_n]/D");
-    rootTree->Branch("odet_timeCFD407",&odet_timeCFD407,"odet_timeCFD407[odet_n]/D");
-    rootTree->Branch("odet_timeCFD408",&odet_timeCFD408,"odet_timeCFD408[odet_n]/D");
-    rootTree->Branch("odet_timeCFD409",&odet_timeCFD409,"odet_timeCFD409[odet_n]/D");
-    rootTree->Branch("odet_timeCFD410",&odet_timeCFD410,"odet_timeCFD410[odet_n]/D");
-    rootTree->Branch("odet_timeCFD411",&odet_timeCFD411,"odet_timeCFD411[odet_n]/D");
-    rootTree->Branch("odet_timeCFD412",&odet_timeCFD412,"odet_timeCFD412[odet_n]/D");
-    rootTree->Branch("odet_timeCFD500",&odet_timeCFD500,"odet_timeCFD500[odet_n]/D");
-    rootTree->Branch("odet_timeCFD501",&odet_timeCFD501,"odet_timeCFD501[odet_n]/D");
-    rootTree->Branch("odet_timeCFD502",&odet_timeCFD502,"odet_timeCFD502[odet_n]/D");
-    rootTree->Branch("odet_timeCFD503",&odet_timeCFD503,"odet_timeCFD503[odet_n]/D");
-    rootTree->Branch("odet_timeCFD504",&odet_timeCFD504,"odet_timeCFD504[odet_n]/D");
-    rootTree->Branch("odet_timeCFD505",&odet_timeCFD505,"odet_timeCFD505[odet_n]/D");
-    rootTree->Branch("odet_timeCFD506",&odet_timeCFD506,"odet_timeCFD506[odet_n]/D");
-    rootTree->Branch("odet_timeCFD507",&odet_timeCFD507,"odet_timeCFD507[odet_n]/D");
-    rootTree->Branch("odet_timeCFD508",&odet_timeCFD508,"odet_timeCFD508[odet_n]/D");
-    rootTree->Branch("odet_timeCFD509",&odet_timeCFD509,"odet_timeCFD509[odet_n]/D");
-    rootTree->Branch("odet_timeCFD510",&odet_timeCFD510,"odet_timeCFD510[odet_n]/D");
-    rootTree->Branch("odet_timeCFD511",&odet_timeCFD511,"odet_timeCFD511[odet_n]/D");
-    rootTree->Branch("odet_timeCFD512",&odet_timeCFD512,"odet_timeCFD512[odet_n]/D");
-  }
-  if (store_odet_timeC1)       {
-    rootTree->Branch("odet_timeC1",&odet_timeC1,"odet_timeC1[odet_n]/D");
-    rootTree->Branch("odet_timeC2",&odet_timeC2,"odet_timeC2[odet_n]/D");
-    rootTree->Branch("odet_timeC3",&odet_timeC3,"odet_timeC3[odet_n]/D");
-    rootTree->Branch("odet_timeC4",&odet_timeC4,"odet_timeC4[odet_n]/D");
-    rootTree->Branch("odet_timeC5",&odet_timeC5,"odet_timeC5[odet_n]/D");
-    rootTree->Branch("odet_timeC6",&odet_timeC6,"odet_timeC6[odet_n]/D");
-    rootTree->Branch("odet_timeC7",&odet_timeC7,"odet_timeC7[odet_n]/D");
-    rootTree->Branch("odet_timeC8",&odet_timeC8,"odet_timeC8[odet_n]/D");
-    rootTree->Branch("odet_timeC9",&odet_timeC9,"odet_timeC9[odet_n]/D");
-    rootTree->Branch("odet_timeC10",&odet_timeC10,"odet_timeC10[odet_n]/D");
-    rootTree->Branch("odet_timeC11",&odet_timeC11,"odet_timeC11[odet_n]/D");
-    rootTree->Branch("odet_timeC12",&odet_timeC12,"odet_timeC12[odet_n]/D");
-    rootTree->Branch("odet_timeC13",&odet_timeC13,"odet_timeC13[odet_n]/D");
-    rootTree->Branch("odet_timeC14",&odet_timeC14,"odet_timeC14[odet_n]/D");
-    rootTree->Branch("odet_timeC15",&odet_timeC15,"odet_timeC15[odet_n]/D");
-    rootTree->Branch("odet_timeC16",&odet_timeC16,"odet_timeC16[odet_n]/D");
-    rootTree->Branch("odet_timeC17",&odet_timeC17,"odet_timeC17[odet_n]/D");
-    rootTree->Branch("odet_timeC18",&odet_timeC18,"odet_timeC18[odet_n]/D");
-    rootTree->Branch("odet_timeC19",&odet_timeC19,"odet_timeC19[odet_n]/D");
-    rootTree->Branch("odet_timeC20",&odet_timeC20,"odet_timeC20[odet_n]/D");
-    rootTree->Branch("odet_timeC21",&odet_timeC21,"odet_timeC21[odet_n]/D");
-    rootTree->Branch("odet_timeC22",&odet_timeC22,"odet_timeC22[odet_n]/D");
-    rootTree->Branch("odet_timeC23",&odet_timeC23,"odet_timeC23[odet_n]/D");
-    rootTree->Branch("odet_timeC24",&odet_timeC24,"odet_timeC24[odet_n]/D");
-    rootTree->Branch("odet_timeC25",&odet_timeC25,"odet_timeC25[odet_n]/D");
-    rootTree->Branch("odet_timeC26",&odet_timeC26,"odet_timeC26[odet_n]/D");
-    rootTree->Branch("odet_timeC27",&odet_timeC27,"odet_timeC27[odet_n]/D");
-    rootTree->Branch("odet_timeC28",&odet_timeC28,"odet_timeC28[odet_n]/D");
-    rootTree->Branch("odet_timeC29",&odet_timeC29,"odet_timeC29[odet_n]/D");
-    rootTree->Branch("odet_timeC30",&odet_timeC30,"odet_timeC30[odet_n]/D");
-    rootTree->Branch("odet_timeC31",&odet_timeC31,"odet_timeC31[odet_n]/D");
-    rootTree->Branch("odet_timeC32",&odet_timeC32,"odet_timeC32[odet_n]/D");
-    rootTree->Branch("odet_timeC33",&odet_timeC33,"odet_timeC33[odet_n]/D");
-    rootTree->Branch("odet_timeC34",&odet_timeC34,"odet_timeC34[odet_n]/D");
-    rootTree->Branch("odet_timeC35",&odet_timeC35,"odet_timeC35[odet_n]/D");
-    rootTree->Branch("odet_timeC36",&odet_timeC36,"odet_timeC36[odet_n]/D");
-    rootTree->Branch("odet_timeC37",&odet_timeC37,"odet_timeC37[odet_n]/D");
-    rootTree->Branch("odet_timeC38",&odet_timeC38,"odet_timeC38[odet_n]/D");
-    rootTree->Branch("odet_timeC39",&odet_timeC39,"odet_timeC39[odet_n]/D");
-    rootTree->Branch("odet_timeC40",&odet_timeC40,"odet_timeC40[odet_n]/D");
-  }
 
+  if (musrParameters::boolG4OpticalPhotons) {
+    if (store_odet_ID || store_odet_nPhot || store_odet_nPhotPrim || store_odet_timeFirst || store_odet_timeSecond || 
+	store_odet_timeThird || store_odet_timeA || store_odet_timeB || store_odet_timeC || store_odet_timeD || 
+	store_odet_timeMean || store_odet_timeLast || store_odet_timeCFD || store_odet_amplCFD || store_odet_timeC1)
+                              {rootTree->Branch("odet_n",&odet_n,"odet_n/I");}
+    if (store_odet_ID)          {rootTree->Branch("odet_ID",&odet_ID,"odet_ID[odet_n]/I");}
+    if (store_odet_nPhot)       {rootTree->Branch("odet_nPhot",&odet_nPhot,"odet_nPhot[odet_n]/I");}
+    if (store_odet_nPhotPrim)   {rootTree->Branch("odet_nPhotPrim",&odet_nPhotPrim,"odet_nPhotPrim[odet_n]/I");}
+    if (store_odet_timeFirst)   {rootTree->Branch("odet_timeFirst",&odet_timeFirst,"odet_timeFirst[odet_n]/D");}
+    if (store_odet_timeSecond)  {rootTree->Branch("odet_timeSecond",&odet_timeSecond,"odet_timeSecond[odet_n]/D");}
+    if (store_odet_timeThird)   {rootTree->Branch("odet_timeThird",&odet_timeThird,"odet_timeThird[odet_n]/D");}
+    if (store_odet_timeA)       {rootTree->Branch("odet_timeA",&odet_timeA,"odet_timeA[odet_n]/D");}
+    if (store_odet_timeB)       {rootTree->Branch("odet_timeB",&odet_timeB,"odet_timeB[odet_n]/D");}
+    if (store_odet_timeC)       {rootTree->Branch("odet_timeC",&odet_timeC,"odet_timeC[odet_n]/D");}
+    if (store_odet_timeD)       {rootTree->Branch("odet_timeD",&odet_timeD,"odet_timeD[odet_n]/D");}
+    if (store_odet_timeMean)       {rootTree->Branch("odet_timeMean",&odet_timeMean,"odet_timeMean[odet_n]/D");}
+    if (store_odet_timeLast)    {rootTree->Branch("odet_timeLast",&odet_timeLast,"odet_timeLast[odet_n]/D");}
+    if (store_odet_timeCFD)     {rootTree->Branch("odet_timeCFD",&odet_timeCFD,"odet_timeCFD[odet_n]/D");}
+    if (store_odet_amplCFD)     {rootTree->Branch("odet_amplCFD",&odet_amplCFD,"odet_amplCFD[odet_n]/D");}
+    if (store_odet_timeCFDarray)     {
+      rootTree->Branch("odet_timeCFD100",&odet_timeCFD100,"odet_timeCFD100[odet_n]/D");
+      rootTree->Branch("odet_timeCFD101",&odet_timeCFD101,"odet_timeCFD101[odet_n]/D");
+      rootTree->Branch("odet_timeCFD102",&odet_timeCFD102,"odet_timeCFD102[odet_n]/D");
+      rootTree->Branch("odet_timeCFD103",&odet_timeCFD103,"odet_timeCFD103[odet_n]/D");
+      rootTree->Branch("odet_timeCFD104",&odet_timeCFD104,"odet_timeCFD104[odet_n]/D");
+      rootTree->Branch("odet_timeCFD105",&odet_timeCFD105,"odet_timeCFD105[odet_n]/D");
+      rootTree->Branch("odet_timeCFD106",&odet_timeCFD106,"odet_timeCFD106[odet_n]/D");
+      rootTree->Branch("odet_timeCFD107",&odet_timeCFD107,"odet_timeCFD107[odet_n]/D");
+      rootTree->Branch("odet_timeCFD108",&odet_timeCFD108,"odet_timeCFD108[odet_n]/D");
+      rootTree->Branch("odet_timeCFD109",&odet_timeCFD109,"odet_timeCFD109[odet_n]/D");
+      rootTree->Branch("odet_timeCFD110",&odet_timeCFD110,"odet_timeCFD110[odet_n]/D");
+      rootTree->Branch("odet_timeCFD111",&odet_timeCFD111,"odet_timeCFD111[odet_n]/D");
+      rootTree->Branch("odet_timeCFD112",&odet_timeCFD112,"odet_timeCFD112[odet_n]/D");
+      rootTree->Branch("odet_timeCFD200",&odet_timeCFD200,"odet_timeCFD200[odet_n]/D");
+      rootTree->Branch("odet_timeCFD201",&odet_timeCFD201,"odet_timeCFD201[odet_n]/D");
+      rootTree->Branch("odet_timeCFD202",&odet_timeCFD202,"odet_timeCFD202[odet_n]/D");
+      rootTree->Branch("odet_timeCFD203",&odet_timeCFD203,"odet_timeCFD203[odet_n]/D");
+      rootTree->Branch("odet_timeCFD204",&odet_timeCFD204,"odet_timeCFD204[odet_n]/D");
+      rootTree->Branch("odet_timeCFD205",&odet_timeCFD205,"odet_timeCFD205[odet_n]/D");
+      rootTree->Branch("odet_timeCFD206",&odet_timeCFD206,"odet_timeCFD206[odet_n]/D");
+      rootTree->Branch("odet_timeCFD207",&odet_timeCFD207,"odet_timeCFD207[odet_n]/D");
+      rootTree->Branch("odet_timeCFD208",&odet_timeCFD208,"odet_timeCFD208[odet_n]/D");
+      rootTree->Branch("odet_timeCFD209",&odet_timeCFD209,"odet_timeCFD209[odet_n]/D");
+      rootTree->Branch("odet_timeCFD210",&odet_timeCFD210,"odet_timeCFD210[odet_n]/D");
+      rootTree->Branch("odet_timeCFD211",&odet_timeCFD211,"odet_timeCFD211[odet_n]/D");
+      rootTree->Branch("odet_timeCFD212",&odet_timeCFD212,"odet_timeCFD212[odet_n]/D");
+      rootTree->Branch("odet_timeCFD300",&odet_timeCFD300,"odet_timeCFD300[odet_n]/D");
+      rootTree->Branch("odet_timeCFD301",&odet_timeCFD301,"odet_timeCFD301[odet_n]/D");
+      rootTree->Branch("odet_timeCFD302",&odet_timeCFD302,"odet_timeCFD302[odet_n]/D");
+      rootTree->Branch("odet_timeCFD303",&odet_timeCFD303,"odet_timeCFD303[odet_n]/D");
+      rootTree->Branch("odet_timeCFD304",&odet_timeCFD304,"odet_timeCFD304[odet_n]/D");
+      rootTree->Branch("odet_timeCFD305",&odet_timeCFD305,"odet_timeCFD305[odet_n]/D");
+      rootTree->Branch("odet_timeCFD306",&odet_timeCFD306,"odet_timeCFD306[odet_n]/D");
+      rootTree->Branch("odet_timeCFD307",&odet_timeCFD307,"odet_timeCFD307[odet_n]/D");
+      rootTree->Branch("odet_timeCFD308",&odet_timeCFD308,"odet_timeCFD308[odet_n]/D");
+      rootTree->Branch("odet_timeCFD309",&odet_timeCFD309,"odet_timeCFD309[odet_n]/D");
+      rootTree->Branch("odet_timeCFD310",&odet_timeCFD310,"odet_timeCFD310[odet_n]/D");
+      rootTree->Branch("odet_timeCFD311",&odet_timeCFD311,"odet_timeCFD311[odet_n]/D");
+      rootTree->Branch("odet_timeCFD312",&odet_timeCFD312,"odet_timeCFD312[odet_n]/D");
+      rootTree->Branch("odet_timeCFD400",&odet_timeCFD400,"odet_timeCFD400[odet_n]/D");
+      rootTree->Branch("odet_timeCFD401",&odet_timeCFD401,"odet_timeCFD401[odet_n]/D");
+      rootTree->Branch("odet_timeCFD402",&odet_timeCFD402,"odet_timeCFD402[odet_n]/D");
+      rootTree->Branch("odet_timeCFD403",&odet_timeCFD403,"odet_timeCFD403[odet_n]/D");
+      rootTree->Branch("odet_timeCFD404",&odet_timeCFD404,"odet_timeCFD404[odet_n]/D");
+      rootTree->Branch("odet_timeCFD405",&odet_timeCFD405,"odet_timeCFD405[odet_n]/D");
+      rootTree->Branch("odet_timeCFD406",&odet_timeCFD406,"odet_timeCFD406[odet_n]/D");
+      rootTree->Branch("odet_timeCFD407",&odet_timeCFD407,"odet_timeCFD407[odet_n]/D");
+      rootTree->Branch("odet_timeCFD408",&odet_timeCFD408,"odet_timeCFD408[odet_n]/D");
+      rootTree->Branch("odet_timeCFD409",&odet_timeCFD409,"odet_timeCFD409[odet_n]/D");
+      rootTree->Branch("odet_timeCFD410",&odet_timeCFD410,"odet_timeCFD410[odet_n]/D");
+      rootTree->Branch("odet_timeCFD411",&odet_timeCFD411,"odet_timeCFD411[odet_n]/D");
+      rootTree->Branch("odet_timeCFD412",&odet_timeCFD412,"odet_timeCFD412[odet_n]/D");
+      rootTree->Branch("odet_timeCFD500",&odet_timeCFD500,"odet_timeCFD500[odet_n]/D");
+      rootTree->Branch("odet_timeCFD501",&odet_timeCFD501,"odet_timeCFD501[odet_n]/D");
+      rootTree->Branch("odet_timeCFD502",&odet_timeCFD502,"odet_timeCFD502[odet_n]/D");
+      rootTree->Branch("odet_timeCFD503",&odet_timeCFD503,"odet_timeCFD503[odet_n]/D");
+      rootTree->Branch("odet_timeCFD504",&odet_timeCFD504,"odet_timeCFD504[odet_n]/D");
+      rootTree->Branch("odet_timeCFD505",&odet_timeCFD505,"odet_timeCFD505[odet_n]/D");
+      rootTree->Branch("odet_timeCFD506",&odet_timeCFD506,"odet_timeCFD506[odet_n]/D");
+      rootTree->Branch("odet_timeCFD507",&odet_timeCFD507,"odet_timeCFD507[odet_n]/D");
+      rootTree->Branch("odet_timeCFD508",&odet_timeCFD508,"odet_timeCFD508[odet_n]/D");
+      rootTree->Branch("odet_timeCFD509",&odet_timeCFD509,"odet_timeCFD509[odet_n]/D");
+      rootTree->Branch("odet_timeCFD510",&odet_timeCFD510,"odet_timeCFD510[odet_n]/D");
+      rootTree->Branch("odet_timeCFD511",&odet_timeCFD511,"odet_timeCFD511[odet_n]/D");
+      rootTree->Branch("odet_timeCFD512",&odet_timeCFD512,"odet_timeCFD512[odet_n]/D");
+    }
+    if (store_odet_timeC1)       {
+      rootTree->Branch("odet_timeC1",&odet_timeC1,"odet_timeC1[odet_n]/D");
+      rootTree->Branch("odet_timeC2",&odet_timeC2,"odet_timeC2[odet_n]/D");
+      rootTree->Branch("odet_timeC3",&odet_timeC3,"odet_timeC3[odet_n]/D");
+      rootTree->Branch("odet_timeC4",&odet_timeC4,"odet_timeC4[odet_n]/D");
+      rootTree->Branch("odet_timeC5",&odet_timeC5,"odet_timeC5[odet_n]/D");
+      rootTree->Branch("odet_timeC6",&odet_timeC6,"odet_timeC6[odet_n]/D");
+      rootTree->Branch("odet_timeC7",&odet_timeC7,"odet_timeC7[odet_n]/D");
+      rootTree->Branch("odet_timeC8",&odet_timeC8,"odet_timeC8[odet_n]/D");
+      rootTree->Branch("odet_timeC9",&odet_timeC9,"odet_timeC9[odet_n]/D");
+      rootTree->Branch("odet_timeC10",&odet_timeC10,"odet_timeC10[odet_n]/D");
+      rootTree->Branch("odet_timeC11",&odet_timeC11,"odet_timeC11[odet_n]/D");
+      rootTree->Branch("odet_timeC12",&odet_timeC12,"odet_timeC12[odet_n]/D");
+      rootTree->Branch("odet_timeC13",&odet_timeC13,"odet_timeC13[odet_n]/D");
+      rootTree->Branch("odet_timeC14",&odet_timeC14,"odet_timeC14[odet_n]/D");
+      rootTree->Branch("odet_timeC15",&odet_timeC15,"odet_timeC15[odet_n]/D");
+      rootTree->Branch("odet_timeC16",&odet_timeC16,"odet_timeC16[odet_n]/D");
+      rootTree->Branch("odet_timeC17",&odet_timeC17,"odet_timeC17[odet_n]/D");
+      rootTree->Branch("odet_timeC18",&odet_timeC18,"odet_timeC18[odet_n]/D");
+      rootTree->Branch("odet_timeC19",&odet_timeC19,"odet_timeC19[odet_n]/D");
+      rootTree->Branch("odet_timeC20",&odet_timeC20,"odet_timeC20[odet_n]/D");
+      rootTree->Branch("odet_timeC21",&odet_timeC21,"odet_timeC21[odet_n]/D");
+      rootTree->Branch("odet_timeC22",&odet_timeC22,"odet_timeC22[odet_n]/D");
+      rootTree->Branch("odet_timeC23",&odet_timeC23,"odet_timeC23[odet_n]/D");
+      rootTree->Branch("odet_timeC24",&odet_timeC24,"odet_timeC24[odet_n]/D");
+      rootTree->Branch("odet_timeC25",&odet_timeC25,"odet_timeC25[odet_n]/D");
+      rootTree->Branch("odet_timeC26",&odet_timeC26,"odet_timeC26[odet_n]/D");
+      rootTree->Branch("odet_timeC27",&odet_timeC27,"odet_timeC27[odet_n]/D");
+      rootTree->Branch("odet_timeC28",&odet_timeC28,"odet_timeC28[odet_n]/D");
+      rootTree->Branch("odet_timeC29",&odet_timeC29,"odet_timeC29[odet_n]/D");
+      rootTree->Branch("odet_timeC30",&odet_timeC30,"odet_timeC30[odet_n]/D");
+      rootTree->Branch("odet_timeC31",&odet_timeC31,"odet_timeC31[odet_n]/D");
+      rootTree->Branch("odet_timeC32",&odet_timeC32,"odet_timeC32[odet_n]/D");
+      rootTree->Branch("odet_timeC33",&odet_timeC33,"odet_timeC33[odet_n]/D");
+      rootTree->Branch("odet_timeC34",&odet_timeC34,"odet_timeC34[odet_n]/D");
+      rootTree->Branch("odet_timeC35",&odet_timeC35,"odet_timeC35[odet_n]/D");
+      rootTree->Branch("odet_timeC36",&odet_timeC36,"odet_timeC36[odet_n]/D");
+      rootTree->Branch("odet_timeC37",&odet_timeC37,"odet_timeC37[odet_n]/D");
+      rootTree->Branch("odet_timeC38",&odet_timeC38,"odet_timeC38[odet_n]/D");
+      rootTree->Branch("odet_timeC39",&odet_timeC39,"odet_timeC39[odet_n]/D");
+      rootTree->Branch("odet_timeC40",&odet_timeC40,"odet_timeC40[odet_n]/D");
+    }
+  }
   //  htest1 = new TH1F("htest1","The debugging histogram 1",50,-4.,4.);
   //  htest2 = new TH1F("htest2","The debugging histogram 2",50,0.,3.142);
   htest1 = new TH2F("htest1","x, y",50,-200.,200.,50,-200.,200.);