The change is only in the "heavy flavour" part of GeneratedMB().

[u/mrichter/AliRoot.git] / ZDC / AliZDCQADataMakerSim.cxx

diff --git a/ZDC/AliZDCQADataMakerSim.cxx b/ZDC/AliZDCQADataMakerSim.cxx
index 2443de795ef632e12a0a2b671e77b3434cf7e354..a09812817c308f90fc15eb821d738e84a0f8998b 100644 (file)
--- a/ZDC/AliZDCQADataMakerSim.cxx
+++ b/ZDC/AliZDCQADataMakerSim.cxx
@@ -231,9 +231,10 @@ void AliZDCQADataMakerSim::MakeHits()
 void AliZDCQADataMakerSim::MakeHits(TTree * hitTree)\r
 {\r
   // make QA data from Hit Tree\r
-  \r
-  if(fHitsArray) fHitsArray->Clear() ; \r
-  else fHitsArray = new TClonesArray("AliZDCHit", 1000);\r
+  if(!hitTree){\r
+    AliError("Can't get ZDC hit tree!!");\r
+    return; \r
+  }    \r
 \r
   TBranch * branch = hitTree->GetBranch("ZDC") ;\r
 \r
@@ -241,37 +242,49 @@ void AliZDCQADataMakerSim::MakeHits(TTree * hitTree)
     AliError("ZDC branch in Hit Tree not found!"); \r
     return;\r
   } \r
-  else{\r
-    Int_t nHits = 0;\r
-    branch->SetAddress(&fHitsArray) ;\r
-    for (Int_t ientry = 0 ; ientry < branch->GetEntries() ; ientry++) {\r
-      branch->GetEntry(ientry) ;\r
-      nHits += fHitsArray->GetEntriesFast();\r
-      MakeHits() ; \r
-      fHitsArray->Clear();\r
-    }  \r
-  }\r
+  \r
+  if(fHitsArray) fHitsArray->Clear() ; \r
+  else fHitsArray = new TClonesArray("AliZDCHit", 1000);\r
+ \r
+  branch->SetAddress(&fHitsArray) ;\r
+  for (Int_t ientry = 0 ; ientry < branch->GetEntries() ; ientry++) {\r
+    branch->GetEntry(ientry) ;\r
+    MakeHits() ; \r
+    fHitsArray->Clear() ; \r
+  }   \r
+\r
 }\r
 \r
 //___________________________________________________________________________\r
-void AliZDCQADataMakerSim::MakeDigits()\r
+void AliZDCQADataMakerSim::MakeDigits(TTree *digitTree)\r
 {\r
-  // makes data from Digits\r
+  // makes data from Digit Tree\r
   if( !GetDigitsData(0) ) InitDigits();\r
-  \r
-  Int_t nentries = fDigitsArray->GetEntriesFast();\r
-  if(nentries==0) printf(" AliZDCQADataMakerSim: NO entries in digit array\n\n");\r
-  \r
-  TIter next(fDigitsArray); \r
-  AliZDCDigit * digit;\r
+\r
+  if(!digitTree){\r
+    AliError("Can't get ZDC digit tree!!");\r
+    return; \r
+  }    \r
+   \r
+  TBranch * branch = digitTree->GetBranch("ZDC");\r
+  if(!branch){\r
+    AliError("ZDC branch in digit tree not found"); \r
+    return;\r
+  } \r
+    \r
+  AliZDCDigit *digit = 0x0;\r
+  branch->SetAddress(&digit);\r
      \r
   Float_t adcSum_ZNC=0., adcSum_ZNA=0., adcSum_ZPC=0., adcSum_ZPA=0.;\r
   Float_t adcSumQ_ZNC=0., adcSumQ_ZNA=0., adcSumQ_ZPC=0., adcSumQ_ZPA=0.;\r
   Float_t adcSum_ZNC_lg=0., adcSum_ZNA_lg=0., adcSum_ZPC_lg=0., adcSum_ZPA_lg=0.;\r
   Float_t adcSumQ_ZNC_lg=0., adcSumQ_ZNA_lg=0., adcSumQ_ZPC_lg=0., adcSumQ_ZPA_lg=0.;\r
   \r
-  while ( (digit = dynamic_cast<AliZDCDigit *>(next())) ) {\r
-      if(digit->GetSector(0)==1){\r
+  Int_t ndig = digitTree->GetEntries();\r
+  for(Int_t i=0; i<ndig; i++){\r
+      branch->GetEntry(i);\r
+      \r
+      if(digit->GetSector(0)==1 && digit->GetSector(1)!=5){\r
          adcSum_ZNC += digit->GetADCValue(0);\r
          adcSum_ZNC_lg += digit->GetADCValue(1);\r
          //\r
@@ -297,7 +310,7 @@ void AliZDCQADataMakerSim::MakeDigits()
              GetDigitsData(22)->Fill(digit->GetADCValue(1));\r
          }\r
       }\r
-      else if(digit->GetSector(0)==4){\r
+      else if(digit->GetSector(0)==4 && digit->GetSector(1)!=5){\r
          adcSum_ZNA += digit->GetADCValue(0);\r
          adcSum_ZNA_lg += digit->GetADCValue(1);\r
          //\r
@@ -347,25 +360,6 @@ void AliZDCQADataMakerSim::MakeDigits()
 \r
 }\r
 \r
-//___________________________________________________________________________\r
-void AliZDCQADataMakerSim::MakeDigits(TTree *digitTree)\r
-{\r
-  // makes data from Digit Tree\r
-  if(fDigitsArray) fDigitsArray->Clear() ; \r
-  else fDigitsArray = new TClonesArray("AliZDCDigit", 1000) ; \r
-   \r
-  TBranch * branch = digitTree->GetBranch("ZDC");\r
-  if(!branch){\r
-    AliError("ZDC branch in Digit Tree not found"); \r
-    return;\r
-  } \r
-  \r
-  branch->SetAddress(&fDigitsArray);\r
-  branch->GetEntry(0) ; \r
-  MakeDigits() ; \r
-  fDigitsArray->Clear();\r
-}\r
-\r
 //____________________________________________________________________________\r
 void AliZDCQADataMakerSim::StartOfDetectorCycle()\r
 {\r