* about the suitability of this software for any purpose. It is *\r
* provided "as is" without express or implied warranty. *\r
**************************************************************************/\r
+\r
// --- Standard library ---\r
#include <Riostream.h>\r
// --- ROOT system ---\r
#include <TClonesArray.h>\r
-#include <TFile.h> \r
+#include <TFile.h> \r
#include <TH1F.h> \r
#include <TH2F.h>\r
#include <TBranch.h>\r
#include "AliZDCQADataMakerSim.h"\r
#include "AliZDCHit.h"\r
#include "AliZDCDigit.h"\r
-#include "AliZDCRawStream.h"\r
\r
ClassImp(AliZDCQADataMakerSim)\r
\r
//____________________________________________________________________________ \r
AliZDCQADataMakerSim::AliZDCQADataMakerSim() : \r
- AliQADataMakerSim(AliQA::GetDetName(AliQA::kZDC), "ZDC Quality Assurance Data Maker"),\r
- fHits(0),\r
- fDigit(0)\r
+ AliQADataMakerSim(AliQAv1::GetDetName(AliQAv1::kZDC), "ZDC Quality Assurance Data Maker")\r
{\r
// ctor\r
}\r
\r
//____________________________________________________________________________ \r
AliZDCQADataMakerSim::AliZDCQADataMakerSim(const AliZDCQADataMakerSim& qadm) :\r
- AliQADataMakerSim(), \r
- fHits(0),\r
- fDigit(0) \r
+ AliQADataMakerSim()\r
{\r
//copy ctor \r
SetName((const char*)qadm.GetName()); \r
{\r
// create Hits histograms in Hits subdir\r
//\r
- TH2F * hZNCh = new TH2F("hZNCh", "Hits centroid in ZNC", 100, -5.,5.,100,-5.,5.);\r
- TH2F * hZNAh = new TH2F("hZNAh", "Hits centroid in ZNA", 100, -5.,5.,100,-5.,5.);\r
- TH2F * hZPCh = new TH2F("hZPCh", "Hits centroid in ZPC", 100,-12.,12.,100,-12.,12.); \r
- TH2F * hZPAh = new TH2F("hZPAh", "Hits centroid in ZPA", 100,-12.,12.,100,-12.,12.); \r
- Add2HitsList(hZNCh, 0);\r
- Add2HitsList(hZPCh, 1);\r
- Add2HitsList(hZNAh, 2);\r
- Add2HitsList(hZPAh, 3);\r
+ const Bool_t expert = kTRUE ; \r
+ const Bool_t image = kTRUE ; \r
+\r
+ TH1F * hHitsZNCTot = new TH1F("hHitsZNCTot", "Signal in ZNC; N_{phe}", 100, 0., 6000.);\r
+ TH1F * hHitsZNATot = new TH1F("hHitsZNATot", "Signal in ZNA; N_{phe}", 100, 0., 6000.);\r
+ TH1F * hHitsZPCTot = new TH1F("hHitsZPCTot", "Signal in ZPC; N_{phe}", 100, 0., 6000.);\r
+ TH1F * hHitsZPATot = new TH1F("hHitsZPATot", "Signal in ZPA; N_{phe}", 100, 0., 6000.);\r
+ Add2HitsList(hHitsZNCTot, 0, !expert, image);\r
+ Add2HitsList(hHitsZNATot, 1, !expert, image);\r
+ Add2HitsList(hHitsZPCTot, 2, !expert, image);\r
+ Add2HitsList(hHitsZPATot, 3, !expert, image);\r
+ //\r
+ TH1F * hHitsSumQZNC = new TH1F("hHitsSumQZNC", "Signal in 4 ZNC PMQ; N_{phe}",100, 0., 4000.);\r
+ TH1F * hHitsSumQZNA = new TH1F("hHitsSumQZNA", "Signal in 4 ZNA PMQ; N_{phe}",100, 0., 4000.);\r
+ TH1F * hHitsSumQZPC = new TH1F("hHitsSumQZPC", "Signal in 4 ZPC PMQ; N_{phe}",100, 0., 4000.);\r
+ TH1F * hHitsSumQZPA = new TH1F("hHitsSumQZPA", "Signal in 4 ZPA PMQ; N_{phe}",100, 0., 4000.);\r
+ Add2HitsList(hHitsSumQZNC, 4, expert, !image);\r
+ Add2HitsList(hHitsSumQZNA, 5, expert, !image);\r
+ Add2HitsList(hHitsSumQZPC, 6, expert, !image);\r
+ Add2HitsList(hHitsSumQZPA, 7, expert, !image);\r
+ //\r
+ TH1F * hHitsPMCZNC = new TH1F("hHitsPMCZNC", "Signal in ZNC PMC; N_{phe}",100, 0., 4000.);\r
+ TH1F * hHitsPMCZNA = new TH1F("hHitsPMCZNA", "Signal in ZNA PMC; N_{phe}",100, 0., 4000.);\r
+ TH1F * hHitsPMCZPC = new TH1F("hHitsPMCZPC", "Signal in ZPC PMC; N_{phe}",100, 0., 4000.);\r
+ TH1F * hHitsPMCZPA = new TH1F("hHitsPMCZPA", "Signal in ZPA PMC; N_{phe}",100, 0., 4000.);\r
+ Add2HitsList(hHitsPMCZNC, 8, expert, !image);\r
+ Add2HitsList(hHitsPMCZNA, 9, expert, !image);\r
+ Add2HitsList(hHitsPMCZPC, 10, expert, !image);\r
+ Add2HitsList(hHitsPMCZPA, 11, expert, !image);\r
+ \r
+ ClonePerTrigClass(AliQAv1::kHITS); // this should be the last line\r
}\r
\r
\r
{\r
// create Digits histograms in Digits subdir\r
//\r
- TH1F * hDigZNCTot = new TH1F("hDigZNCTot", "Digit signal in ZNC", 100, 0., 6000.);\r
- TH1F * hDigZNATot = new TH1F("hDigZNATot", "Digit signal in ZNA", 100, 0., 6000.);\r
- TH1F * hDigZPCTot = new TH1F("hDigZPCTot", "Digit signal in ZPC", 100, 0., 10000.);\r
- TH1F * hDigZPATot = new TH1F("hDigZPATot", "Digit signal in ZPA", 100, 0., 10000.);\r
- Add2DigitsList(hDigZNCTot, 0);\r
- Add2DigitsList(hDigZPCTot, 1);\r
- Add2DigitsList(hDigZNATot, 2);\r
- Add2DigitsList(hDigZPATot, 3);\r
+ const Bool_t expert = kTRUE ; \r
+ const Bool_t image = kTRUE ; \r
+ \r
+ // ------------------- HIGH GAIN CHAIN ---------------------------\r
+ TH1F * hDigZNCTot = new TH1F("hDigZNCTot", "Signal in ZNC;Amplitude [ADC counts];Counts", 100, 0., 6000.);\r
+ TH1F * hDigZNATot = new TH1F("hDigZNATot", "Signal in ZNA;Amplitude [ADC counts];Counts", 100, 0., 6000.);\r
+ TH1F * hDigZPCTot = new TH1F("hDigZPCTot", "Signal in ZPC;Amplitude [ADC counts];Counts", 100, 0., 6000.);\r
+ TH1F * hDigZPATot = new TH1F("hDigZPATot", "Signal in ZPA;Amplitude [ADC counts];Counts", 100, 0., 6000.);\r
+ Add2DigitsList(hDigZNCTot, 0, !expert, image);\r
+ Add2DigitsList(hDigZNATot, 1, !expert, image);\r
+ Add2DigitsList(hDigZPCTot, 2, !expert, image);\r
+ Add2DigitsList(hDigZPATot, 3, !expert, image);\r
//\r
- TH1F * hDigSumQZNC = new TH1F("hDigSumQZNC", "Signal in 4 ZNC PMQ[i]",100, 0., 4000.);\r
- TH1F * hDigSumQZPC = new TH1F("hDigSumQZPC", "Signal in 4 ZPC PMQ[i]",100, 0., 4000.);\r
- TH1F * hDigSumQZNA = new TH1F("hDigSumQZNA", "Signal in 4 ZNA PMQ[i]",100, 0., 4000.);\r
- TH1F * hDigSumQZPA = new TH1F("hDigSumQZPA", "Signal in 4 ZPA PMQ[i]",100, 0., 4000.);\r
- Add2DigitsList(hDigSumQZNC, 4);\r
- Add2DigitsList(hDigSumQZPC, 5);\r
- Add2DigitsList(hDigSumQZNA, 6);\r
- Add2DigitsList(hDigSumQZPA, 7);\r
+ TH1F * hDigSumQZNC = new TH1F("hDigSumQZNC", "Signal in 4 ZNC PMQ;Amplitude [ADC counts];Counts",100, 0., 4000.);\r
+ TH1F * hDigSumQZNA = new TH1F("hDigSumQZNA", "Signal in 4 ZNA PMQ;Amplitude [ADC counts];Counts",100, 0., 4000.);\r
+ TH1F * hDigSumQZPC = new TH1F("hDigSumQZPC", "Signal in 4 ZPC PMQ;Amplitude [ADC counts];Counts",100, 0., 4000.);\r
+ TH1F * hDigSumQZPA = new TH1F("hDigSumQZPA", "Signal in 4 ZPA PMQ;Amplitude [ADC counts];Counts",100, 0., 4000.);\r
+ Add2DigitsList(hDigSumQZNC, 4, expert, !image);\r
+ Add2DigitsList(hDigSumQZNA, 5, expert, !image);\r
+ Add2DigitsList(hDigSumQZPC, 6, expert, !image);\r
+ Add2DigitsList(hDigSumQZPA, 7, expert, !image);\r
//\r
- TH1F * hDigPMCZNC = new TH1F("hDigPMCZNC", "Signal in 4 ZNC PMQ[i]",100, 0., 4000.);\r
- TH1F * hDigPMCZPC = new TH1F("hDigPMCZPC", "Signal in 4 ZPC PMQ[i]",100, 0., 4000.);\r
- TH1F * hDigPMCZNA = new TH1F("hDigPMCZNA", "Signal in 4 ZNA PMQ[i]",100, 0., 4000.);\r
- TH1F * hDigPMCZPA = new TH1F("hDigPMCZPA", "Signal in 4 ZPA PMQ[i]",100, 0., 4000.);\r
- Add2DigitsList(hDigPMCZNC, 8);\r
- Add2DigitsList(hDigPMCZPC, 9);\r
- Add2DigitsList(hDigPMCZNA, 10);\r
- Add2DigitsList(hDigPMCZPA, 11);\r
+ TH1F * hDigPMCZNC = new TH1F("hDigPMCZNC", "Signal in ZNC PMC;Amplitude [ADC counts];Counts",100, 0., 4000.);\r
+ TH1F * hDigPMCZNA = new TH1F("hDigPMCZNA", "Signal in ZNA PMC;Amplitude [ADC counts];Counts",100, 0., 4000.);\r
+ TH1F * hDigPMCZPC = new TH1F("hDigPMCZPC", "Signal in ZPC PMC;Amplitude [ADC counts];Counts",100, 0., 4000.);\r
+ TH1F * hDigPMCZPA = new TH1F("hDigPMCZPA", "Signal in ZPA PMC;Amplitude [ADC counts];Counts",100, 0., 4000.);\r
+ Add2DigitsList(hDigPMCZNC, 8, expert, !image);\r
+ Add2DigitsList(hDigPMCZNA, 9, expert, !image);\r
+ Add2DigitsList(hDigPMCZPC, 10, expert, !image);\r
+ Add2DigitsList(hDigPMCZPA, 11, expert, !image);\r
// \r
- // ------------------- LOW GAIN CHAIN ---------------------------\r
- TH1F * hDigZNCTotlg = new TH1F("hDigZNCTotlg", "Digit lg signal in ZNC", 100, 0., 6000.);\r
- TH1F * hDigZNATotlg = new TH1F("hDigZNATotlg", "Digit lg signal in ZNA", 100, 0., 6000.);\r
- TH1F * hDigZPCTotlg = new TH1F("hDigZPCTotlg", "Digit lg signal in ZPC", 100, 0., 10000.);\r
- TH1F * hDigZPATotlg = new TH1F("hDigZPATotlg", "Digit lg signal in ZPA", 100, 0., 10000.);\r
- Add2DigitsList(hDigZNCTotlg, 12);\r
- Add2DigitsList(hDigZPCTotlg, 13);\r
- Add2DigitsList(hDigZNATotlg, 14);\r
- Add2DigitsList(hDigZPATotlg, 15);\r
- //\r
- TH1F * hDigSumQZNClg = new TH1F("hDigSumQZNClg", "Signal in 4 ZNC PMQlg[i]",100, 0., 4000.);\r
- TH1F * hDigSumQZPClg = new TH1F("hDigSumQZPClg", "Signal in 4 ZPC PMQlg[i]",100, 0., 4000.);\r
- TH1F * hDigSumQZNAlg = new TH1F("hDigSumQZNAlg", "Signal in 4 ZNA PMQlg[i]",100, 0., 4000.);\r
- TH1F * hDigSumQZPAlg = new TH1F("hDigSumQZPAlg", "Signal in 4 ZPA PMQlg[i]",100, 0., 4000.);\r
- Add2DigitsList(hDigSumQZNClg, 16);\r
- Add2DigitsList(hDigSumQZPClg, 17);\r
- Add2DigitsList(hDigSumQZNAlg, 18);\r
- Add2DigitsList(hDigSumQZPAlg, 19);\r
//\r
- TH1F * hDigPMCZNClg = new TH1F("hDigPMCZNClg", "Signal in 4 ZNC PMQlg[i]",100, 0., 4000.);\r
- TH1F * hDigPMCZPClg = new TH1F("hDigPMCZPClg", "Signal in 4 ZPC PMQlg[i]",100, 0., 4000.);\r
- TH1F * hDigPMCZNAlg = new TH1F("hDigPMCZNAlg", "Signal in 4 ZNA PMQlg[i]",100, 0., 4000.);\r
- TH1F * hDigPMCZPAlg = new TH1F("hDigPMCZPAlg", "Signal in 4 ZPA PMQlg[i]",100, 0., 4000.);\r
- Add2DigitsList(hDigPMCZNClg, 20);\r
- Add2DigitsList(hDigPMCZPClg, 21);\r
- Add2DigitsList(hDigPMCZNAlg, 22);\r
- Add2DigitsList(hDigPMCZPAlg, 23);\r
+ ClonePerTrigClass(AliQAv1::kDIGITS); // this should be the last line\r
}\r
\r
//____________________________________________________________________________\r
-void AliZDCQADataMakerSim::MakeHits(TClonesArray * /*data*/)\r
+void AliZDCQADataMakerSim::MakeHits()\r
{\r
//filling QA histos for Hits\r
- //\r
- TIter next(fHits); \r
- AliZDCHit * hit; \r
- while((hit = dynamic_cast<AliZDCHit *>(next()))){\r
- if(hit->GetVolume(0)==1) GetHitsData(0)->Fill(hit->GetXImpact(),hit->GetYImpact());\r
- else if(hit->GetVolume(0)==2) GetHitsData(1)->Fill(hit->GetXImpact(), hit->GetYImpact());\r
- else if(hit->GetVolume(0)==4) GetHitsData(2)->Fill(hit->GetXImpact(), hit->GetYImpact());\r
- else if(hit->GetVolume(0)==5) GetHitsData(3)->Fill(hit->GetXImpact(), hit->GetYImpact());\r
+\r
+ // Check id histograms already created for this Event Specie\r
+ if( !GetHitsData(0) ) InitHits();\r
+ \r
+ TIter next(fHitsArray); \r
+ AliZDCHit * hit; \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
+ while((hit = dynamic_cast<AliZDCHit *>(next()))){\r
+ if(hit->GetVolume(0)==1){\r
+ adcSumQ_ZNC += hit->GetLightPMQ();\r
+ adcSum_ZNC += hit->GetLightPMC() + hit->GetLightPMQ();\r
+ //\r
+ FillHitsData(8,hit->GetLightPMC());\r
}\r
+ else if(hit->GetVolume(0)==4){\r
+ adcSumQ_ZNA += hit->GetLightPMQ();\r
+ adcSum_ZNA += hit->GetLightPMC() + hit->GetLightPMQ();\r
+ //\r
+ FillHitsData(9,hit->GetLightPMC());\r
+ }\r
+ else if(hit->GetVolume(0)==2){\r
+ adcSumQ_ZNC += hit->GetLightPMQ();\r
+ adcSum_ZNC += hit->GetLightPMC() + hit->GetLightPMQ();\r
+ //\r
+ FillHitsData(10,hit->GetLightPMC());\r
+ }\r
+ else if(hit->GetVolume(0)==5){\r
+ adcSumQ_ZNC += hit->GetLightPMQ();\r
+ adcSum_ZNC += hit->GetLightPMC() + hit->GetLightPMQ();\r
+ //\r
+ FillHitsData(11,hit->GetLightPMC());\r
+ }\r
+ //\r
+ FillHitsData(0,adcSum_ZNC);\r
+ FillHitsData(1,adcSum_ZNA);\r
+ FillHitsData(2,adcSum_ZPC);\r
+ FillHitsData(3,adcSum_ZPA);\r
+ //\r
+ FillHitsData(4,adcSumQ_ZNC);\r
+ FillHitsData(5,adcSumQ_ZNA);\r
+ FillHitsData(6,adcSumQ_ZPC);\r
+ FillHitsData(7,adcSumQ_ZPA);\r
+ }\r
}\r
\r
//___________________________________________________________________________\r
void AliZDCQADataMakerSim::MakeHits(TTree * hitTree)\r
{\r
// make QA data from Hit Tree\r
- //\r
if(!hitTree){\r
- AliError("Hit Tree not found!"); \r
- return;\r
- }\r
- //\r
+ AliError("Can't get ZDC hit tree!!");\r
+ return; \r
+ } \r
\r
TBranch * branch = hitTree->GetBranch("ZDC") ;\r
\r
if(!branch){\r
AliError("ZDC branch in Hit Tree not found!"); \r
return;\r
- } else {\r
- char** add = (char**) (branch->GetAddress());\r
- if (add) {\r
- fHits = (TClonesArray*)(*add);\r
- } else {\r
- if (!fHits) fHits = new TClonesArray("AliZDCHit", 1000);\r
- branch->SetAddress(&fHits);\r
- }\r
- Int_t ntracks = (Int_t) hitTree->GetEntries();\r
- //printf("\n\t *** no.track %d\n",ntracks);\r
- if (ntracks<=0) return;\r
- //\r
- for(Int_t itrack=0; itrack<ntracks; itrack++){\r
- \r
- branch->GetEntry(itrack);\r
- //\r
- //printf("\t *** track %d",itrack);\r
- //hits->Print("");\r
- //printf("\n");\r
- //\r
- MakeHits(); \r
- fHits->Clear();\r
- } \r
- }\r
-}\r
-\r
-//____________________________________________________________________________\r
-void AliZDCQADataMakerSim::MakeDigits(TClonesArray * /*digits*/)\r
-{\r
- // makes data from Digits\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
+ IncEvCountCycleHits();\r
+ IncEvCountTotalHits();\r
//\r
- \r
}\r
+\r
//___________________________________________________________________________\r
-void AliZDCQADataMakerSim::MakeDigits(TTree *digitTree )\r
+void AliZDCQADataMakerSim::MakeDigits(TTree *digitTree)\r
{\r
- // makes data from Digit Tree\r
- TBranch * branch = digitTree->GetBranch("ZDC");\r
- if(!branch){\r
- AliError("ZDC branch in Digit Tree not found"); \r
- return;\r
- } \r
- char** add = (char**) (branch->GetAddress());\r
- if (add) {\r
- fDigit = (AliZDCDigit*)(*add);\r
- } else {\r
- if (!fDigit) fDigit = new AliZDCDigit();\r
- branch->SetAddress(&fDigit);\r
- }\r
- \r
- Int_t ndig = digitTree->GetEntries();\r
+ // makes data from Digit Tree\r
+ if( !GetDigitsData(0) ) InitDigits();\r
+\r
+ if(!digitTree){\r
+ AliError("Can't get ZDC digit tree!!");\r
+ return; \r
+ } \r
\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
- for (Int_t i = 0; i < ndig; i++) {\r
- digitTree->GetEntry(i);\r
- if(fDigit->GetSector(0)==1){\r
- ADCSum_ZNC += fDigit->GetADCValue(0);\r
- ADCSum_ZNC_lg += fDigit->GetADCValue(1);\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
+ 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
- if(fDigit->GetSector(1)!=0){\r
- ADCSumQ_ZNC += fDigit->GetADCValue(0);\r
- ADCSumQ_ZNC_lg+= fDigit->GetADCValue(1);\r
+ if(digit->GetSector(1)!=0){\r
+ adcSumQ_ZNC += digit->GetADCValue(0);\r
+ //adcSumQ_ZNC_lg+= digit->GetADCValue(1);\r
}\r
else{\r
- GetDigitsData(8)->Fill(fDigit->GetADCValue(0));\r
- GetDigitsData(20)->Fill(fDigit->GetADCValue(1));\r
+ FillDigitsData(8,digit->GetADCValue(0));\r
+ //FillDigitsData(20,digit->GetADCValue(1));\r
}\r
}\r
- else if(fDigit->GetSector(0)==2){\r
- ADCSum_ZPC += fDigit->GetADCValue(0);\r
- ADCSum_ZPC_lg += fDigit->GetADCValue(1);\r
+ else if(digit->GetSector(0)==2){\r
+ adcSum_ZPC += digit->GetADCValue(0);\r
+ //adcSum_ZPC_lg += digit->GetADCValue(1);\r
//\r
- if(fDigit->GetSector(1)!=0){\r
- ADCSumQ_ZPC += fDigit->GetADCValue(0);\r
- ADCSumQ_ZPC_lg+= fDigit->GetADCValue(1);\r
+ if(digit->GetSector(1)!=0){\r
+ adcSumQ_ZPC += digit->GetADCValue(0);\r
+ //adcSumQ_ZPC_lg+= digit->GetADCValue(1);\r
}\r
else{\r
- GetDigitsData(9)->Fill(fDigit->GetADCValue(0));\r
- GetDigitsData(21)->Fill(fDigit->GetADCValue(1));\r
+ FillDigitsData(10,digit->GetADCValue(0));\r
+ //FillDigitsData(22,digit->GetADCValue(1));\r
}\r
}\r
- else if(fDigit->GetSector(0)==4){\r
- ADCSum_ZNA += fDigit->GetADCValue(0);\r
- ADCSum_ZNA_lg += fDigit->GetADCValue(1);\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
- if(fDigit->GetSector(1)!=0){\r
- ADCSumQ_ZNA += fDigit->GetADCValue(0);\r
- ADCSumQ_ZNA_lg+= fDigit->GetADCValue(1);\r
+ if(digit->GetSector(1)!=0){\r
+ adcSumQ_ZNA += digit->GetADCValue(0);\r
+ //adcSumQ_ZNA_lg+= digit->GetADCValue(1);\r
}\r
else{\r
- GetDigitsData(10)->Fill(fDigit->GetADCValue(0));\r
- GetDigitsData(22)->Fill(fDigit->GetADCValue(1));\r
+ FillDigitsData(9,digit->GetADCValue(0));\r
+ //FillDigitsData(21,digit->GetADCValue(1));\r
}\r
}\r
- else if(fDigit->GetSector(0)==5){\r
- ADCSum_ZPA += fDigit->GetADCValue(0);\r
- ADCSum_ZPA_lg += fDigit->GetADCValue(1);\r
+ else if(digit->GetSector(0)==5){\r
+ adcSum_ZPA += digit->GetADCValue(0);\r
+ //adcSum_ZPA_lg += digit->GetADCValue(1);\r
//\r
- if(fDigit->GetSector(1)!=0){\r
- ADCSumQ_ZPA += fDigit->GetADCValue(0);\r
- ADCSumQ_ZPA_lg+= fDigit->GetADCValue(1);\r
+ if(digit->GetSector(1)!=0){\r
+ adcSumQ_ZPA += digit->GetADCValue(0);\r
+ //adcSumQ_ZPA_lg+= digit->GetADCValue(1);\r
}\r
else{\r
- GetDigitsData(11)->Fill(fDigit->GetADCValue(0));\r
- GetDigitsData(23)->Fill(fDigit->GetADCValue(1));\r
+ FillDigitsData(11,digit->GetADCValue(0));\r
+ //FillDigitsData(23,digit->GetADCValue(1));\r
}\r
}\r
}\r
//\r
- GetDigitsData(0)->Fill(ADCSum_ZNC);\r
- GetDigitsData(1)->Fill(ADCSum_ZPC);\r
- GetDigitsData(2)->Fill(ADCSum_ZNA);\r
- GetDigitsData(3)->Fill(ADCSum_ZPA);\r
+ FillDigitsData(0,adcSum_ZNC);\r
+ FillDigitsData(1,adcSum_ZNA);\r
+ FillDigitsData(2,adcSum_ZPC);\r
+ FillDigitsData(3,adcSum_ZPA);\r
//\r
- GetDigitsData(4)->Fill(ADCSumQ_ZNC);\r
- GetDigitsData(5)->Fill(ADCSumQ_ZPC);\r
- GetDigitsData(6)->Fill(ADCSumQ_ZNA);\r
- GetDigitsData(7)->Fill(ADCSumQ_ZPA);\r
+ FillDigitsData(4,adcSumQ_ZNC);\r
+ FillDigitsData(5,adcSumQ_ZNA);\r
+ FillDigitsData(6,adcSumQ_ZPC);\r
+ FillDigitsData(7,adcSumQ_ZPA);\r
//\r
- GetDigitsData(12)->Fill(ADCSum_ZNC_lg);\r
- GetDigitsData(13)->Fill(ADCSum_ZPC_lg);\r
- GetDigitsData(14)->Fill(ADCSum_ZNA_lg);\r
- GetDigitsData(15)->Fill(ADCSum_ZPA_lg);\r
+ IncEvCountCycleDigits();\r
+ IncEvCountTotalDigits();\r
//\r
- GetDigitsData(16)->Fill(ADCSumQ_ZNC_lg);\r
- GetDigitsData(17)->Fill(ADCSumQ_ZPC_lg);\r
- GetDigitsData(18)->Fill(ADCSumQ_ZNA_lg);\r
- GetDigitsData(19)->Fill(ADCSumQ_ZPA_lg);\r
}\r
\r
//____________________________________________________________________________\r
}\r
\r
//____________________________________________________________________________ \r
-void AliZDCQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray * list)\r
+void AliZDCQADataMakerSim::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArray ** list)\r
{\r
- //Detector specific actions at end of cycle\r
+ // Detector specific actions at end of cycle\r
// do the QA checking\r
- AliQAChecker::Instance()->Run(AliQA::kZDC, task, list); \r
+ ResetEventTrigClasses();\r
+ AliQAChecker::Instance()->Run(AliQAv1::kZDC, task, list); \r
}\r
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff