updating e850

Projects/ana_e850/conversion/convert.C

@@ -103,27 +103,32 @@ void convert(int run=48){
     }
 
     if(fVAMOS_TS_sec>0 || fPISTA_TS_sec>0){
-      for(int p=0; p<Inner6MVM; p++){
-      //if(Inner6MVM==1){
-        int crystal = Inner6MVN[p];
-        double E = Inner6MV[p];
-        double EHG = Inner20MV[p];
-        double TDC = DeltaTV[p];
-        unsigned long long TS = Inner6MVTS[p];
-        int seg = -1;
-        double outers1 = -1000;
-        double outers2 = -1000;
-        double outers3 = -1000;
-        double outers4 = -1000;
-        if(OutersVM>25) cout << OutersVM << endl;
-        for(int i=0; i<OutersVM; i++){
-          seg = OutersVN[i] - 4*crystal;
-          if(seg==0) outers1 = OutersV[i];
-          else if(seg==1) outers2 = OutersV[i];
-          else if(seg==2) outers3 = OutersV[i];
-          else if(seg==3) outers4 = OutersV[i];
+      if(OutersVM<25){
+        for(int p=0; p<Inner6MVM; p++){
+          //if(Inner6MVM==2) cout << "********p= " << p << endl;
+          int crystal = Inner6MVN[p];
+          double E = Inner6MV[p];
+          double EHG = Inner20MV[p];
+          double TDC = DeltaTV[p];
+          unsigned long long TS = Inner6MVTS[p];
+          int seg = -1;
+          double outers1 = -1000;
+          double outers2 = -1000;
+          double outers3 = -1000;
+          double outers4 = -1000;
+          for(int i=0; i<OutersVM; i++){
+            seg = OutersVN[i] - 4*crystal;
+            //if(Inner6MVM==2) cout << i << " " << crystal << " " << seg << endl;
+            if(seg==0) outers1 = OutersV[i];
+            else if(seg==1) outers2 = OutersV[i];
+            else if(seg==2) outers3 = OutersV[i];
+            else if(seg==3) outers4 = OutersV[i];
+          }
+          m_exogam->SetExo(crystal,E,EHG,TS,TDC,0,0,outers1,outers2,outers3,outers4);
+          //if(Inner6MVM==2){
+          //  cout << "setting p= " << p << " " << outers1 << " " << outers2 << " " << outers3 << " " << outers4 << endl;
+          //}
         }
-        m_exogam->SetExo(crystal,E,EHG,TS,TDC,0,0,outers1,outers2,outers3,outers4);
       }
     }
 

Projects/ana_e850/conversion/convert.h

@@ -63,8 +63,8 @@ ULong64_t Inner6MVTS[12];
 Float_t Inner20MV[12];
 Float_t DeltaTV[12];
 Float_t OutersV[12];
-//UShort_t OutersVN[12];
-Int_t OutersVN[12];
+UShort_t OutersVN[12];
+//Int_t OutersVN[12];
 Int_t OutersVM;
 
 void InitInputTree();