Bug in TDC OCDB creation fixed

diff --git a/ZDC/AliZDCReconstructor.cxx b/ZDC/AliZDCReconstructor.cxx
index 830506ec18f70bc2631f89914960bdc6592eef79..82b655f72255d87918f15b1876f80b83c172b5e4 100644 (file)
--- a/ZDC/AliZDCReconstructor.cxx
+++ b/ZDC/AliZDCReconstructor.cxx
@@ -1358,7 +1358,7 @@ void AliZDCReconstructor::FillZDCintoESD(TTree *clustersTree, AliESDEvent* esd)
   // we try to keep the TDC oscillations as low as possible!
   for(Int_t jk=0; jk<32; jk++){
     for(Int_t lk=0; lk<4; lk++){
-      if(TMath::Abs(tdcValues[jk][lk])>1e-10){
+      if(tdcValues[jk][lk]!=0.){
         tdcCorrected[jk][lk] = 0.025*(tdcValues[jk][lk]-tdcValues[15][0])+fMeanPhase;
         // Sep 2011: TDC ch. from 8 to 13 centered around 0 using OCDB 
        if(jk>=8 && jk<=13) tdcCorrected[jk][lk] =  tdcCorrected[jk][lk] - tdcOffset[jk-8];

diff --git a/ZDC/ZDCMAPPINGda.cxx b/ZDC/ZDCMAPPINGda.cxx
index 293e2487080570773a1fcd621366dc22c460a8fa..e9605be085380cf291c7b9607411ac05b299f218 100644 (file)
--- a/ZDC/ZDCMAPPINGda.cxx
+++ b/ZDC/ZDCMAPPINGda.cxx
@@ -51,20 +51,22 @@ Trigger Types Used: different trigger types are used
 \r
 int main(int argc, char **argv) {\r
 \r
+  // needed for streamer application\r
   gROOT->GetPluginManager()->AddHandler("TVirtualStreamerInfo",\r
-                                       "*",\r
-                                       "TStreamerInfo",\r
-                                       "RIO",\r
-                                       "TStreamerInfo()"); \r
+                                        "*",\r
+                                        "TStreamerInfo",\r
+                                        "RIO",\r
+                                        "TStreamerInfo()"); \r
+  // needed for Minuit plugin\r
+  gROOT->GetPluginManager()->AddHandler("ROOT::Math::Minimizer",\r
+                                        "Minuit",\r
+                                        "TMinuitMinimizer",\r
+                                        "Minuit",\r
+                                        "TMinuitMinimizer(const char*)");\r
 \r
-  TMinuitMinimizer m; \r
-  gROOT->GetPluginManager()->AddHandler("ROOT::Math::Minimizer", "Minuit","TMinuitMinimizer",\r
-      "Minuit", "TMinuitMinimizer(const char *)");\r
+  //TMinuitMinimizer m; \r
   TVirtualFitter::SetDefaultFitter("Minuit");\r
 \r
-  //const Char_t* tableSOD[]  = {"ALL", "no", "SOD", "all", NULL, NULL};\r
-  //monitorDeclareTable(const_cast<char**>(tableSOD));\r
-  \r
   char *monitor_table[] = { "ALL", "no", "PHY", "yes", "SOD", "all", NULL };\r
   int err = monitorDeclareTable(monitor_table);\r
   if(err){\r
@@ -110,14 +112,13 @@ int main(int argc, char **argv) {
   }\r
  \r
   TH1F * hTDC[6]={0x0,0x0,0x0,0x0,0x0,0x0};\r
-  char ntdchist[20];\r
-  for(Int_t it=0; it<6; it++){\r
-    if(it==0)      hTDC[it] = new TH1F("TDCZNC", "TDC ZNC", 200, -200., 200.);\r
-    else if(it==1) hTDC[it] = new TH1F("TDCZNA", "TDC ZNA", 200, -200., 200.);\r
-    else if(it==2) hTDC[it] = new TH1F("TDCZPC", "TDC ZPC", 200, -200., 200.);\r
-    else if(it==3) hTDC[it] = new TH1F("TDCZPA", "TDC ZPA", 200, -200., 200.);\r
-    else if(it==4) hTDC[it] = new TH1F("TDCZEM1","TDC ZEM1",200, -200., 200.);\r
-    else if(it==5) hTDC[it] = new TH1F("TDCZEM2","TDC ZEM2",200, -200., 200.);\r
+  for(int it=0; it<6; it++){\r
+    if(it==0) hTDC[it] = new TH1F("TDCZEM1","TDC ZEM1",200, -200., 200.);\r
+    else if(it==1) hTDC[it] = new TH1F("TDCZEM2","TDC ZEM2",200, -200., 200.);\r
+    else if(it==2) hTDC[it] = new TH1F("TDCZNC", "TDC ZNC", 200, -200., 200.);\r
+    else if(it==3) hTDC[it] = new TH1F("TDCZPC", "TDC ZPC", 200, -200., 200.);\r
+    else if(it==4) hTDC[it] = new TH1F("TDCZNA", "TDC ZNA", 200, -200., 200.);\r
+    else if(it==5) hTDC[it] = new TH1F("TDCZPA", "TDC ZPA", 200, -200., 200.);\r
   }\r
   \r
   /* log start of process */\r
@@ -125,7 +126,7 @@ int main(int argc, char **argv) {
   signal(SIGSEGV, SIG_DFL);\r
 \r
   /* check that we got some arguments = list of files */\r
-  if (argc<2) {\r
+  if(argc<2) {\r
     printf("Wrong number of arguments\n");\r
     return -1;\r
   }\r
@@ -133,8 +134,7 @@ int main(int argc, char **argv) {
   FILE *mapFile4Shuttle;\r
 \r
   /* read the data files */\r
-  int n;\r
-  for(n=1;n<argc;n++){\r
+  for(int n=1;n<argc;n++){\r
    \r
     status=monitorSetDataSource( argv[n] );\r
     if (status!=0) {\r
@@ -268,7 +268,7 @@ int main(int argc, char **argv) {
        rawStreamZDC->SetSODReading(kTRUE);\r
 \r
        // ----- Setting ch. mapping -----\r
-       for(Int_t jk=0; jk<2*kNChannels; jk++){\r
+       for(int jk=0; jk<2*kNChannels; jk++){\r
          rawStreamZDC->SetMapADCMod(jk, adcMod[jk]);\r
          rawStreamZDC->SetMapADCCh(jk, adcCh[jk]);\r
          rawStreamZDC->SetMapADCSig(jk, sigCode[jk]);\r
@@ -286,24 +286,22 @@ int main(int argc, char **argv) {
              else ihittdc=0;\r
              iprevtdc=itdc;\r
             //\r
-            //if(ihittdc==0) printf("   TDC%d %1.0f ns  \n",itdc, 0.025*rawStreamZDC->GetZDCTDCDatum());\r
-            //\r
-            if(((itdc>=8 && itdc<=13) || itdc==15) && ihittdc<1){\r
+            if(((itdc>=8 && itdc<=13) || itdc==15) && ihittdc==0){\r
                if(itdc!=15){\r
                 tdcData[itdc-8] = 0.025*rawStreamZDC->GetZDCTDCDatum();\r
                 //\r
-                //printf("   **** TDC%d %1.0f ns  \n",itdc, tdcData[itdc-8]);\r
+                //printf("   ev.%d **** TDC%d %1.0f ns  \n",nphys,itdc, tdcData[itdc-8]);\r
               }\r
               //\r
               else if(itdc==15){\r
                  tdcL0 = 0.025*rawStreamZDC->GetZDCTDCDatum();\r
                  //\r
-                 //printf("   ++++ TDCL0 %1.0f ns  \n",tdcL0);\r
+                 //printf("   ev.%d ++++ TDCL0 %1.0f ns  \n",nphys,tdcL0);\r
                  //\r
                  for(int ic=0; ic<6; ic++){\r
                    if(tdcData[ic]!=-999. && tdcL0!=-999.){\r
                      hTDC[ic]->Fill(tdcData[ic]-tdcL0);\r
-                     //printf(" -> Filling histo%d: %f ns\n",ic, tdcData[ic]-tdcL0);\r
+                     //printf(" ev.%d -> Filling histo%d: %f ns\n",nphys,ic, tdcData[ic]-tdcL0);\r
                    }\r
                  }\r
                }\r
@@ -311,20 +309,17 @@ int main(int argc, char **argv) {
          }\r
         }\r
        \r
-        /*for(int ic=0; ic<6; ic++){\r
-          if(tdcData[ic]!=-999. && tdcL0!=-999.) hTDC[ic]->Fill(tdcData[ic]-tdcL0);\r
-        }*/\r
-       nphys++;\r
-       \r
+       nphys++;\r
+      \r
+        delete rawStreamZDC;\r
+        rawStreamZDC = 0x0;    \r
+\r
       }//(if PHYSICS_EVENT) \r
       else if(eventT==END_OF_RUN){\r
         printf("End Of Run detected\n");\r
         break;\r
       }\r
       \r
-      delete rawStreamZDC;\r
-      rawStreamZDC = 0x0;\r
-      \r
       iev++; \r
 \r
       /* free resources */\r
@@ -344,7 +339,7 @@ int main(int argc, char **argv) {
   Int_t binMax=0, nBinsx=0;\r
   Float_t mean[6]={0.,0.,0.,0.,0.,0.}, sigma[6]={0.,0.,0.,0.,0.,0.};\r
   TF1 *fitfun[6]={0x0,0x0,0x0,0x0,0x0,0x0};\r
-  for(Int_t k=0; k<6; k++){\r
+  for(int k=0; k<6; k++){\r
     if(hTDC[k]->GetEntries()!=0){\r
        binMax = hTDC[k]->GetMaximumBin();\r
        if(binMax<=1){\r