Add2HitsList(hHitsPMCZPC, 10, expert, !image);\r
Add2HitsList(hHitsPMCZPA, 11, expert, !image);\r
\r
- TH2F * hHitsZNCh = new TH2F("hHitsZNCh", "Hits centroid in ZNC;Centroid position [cm];Counts", 100, -5.,5.,100,-5.,5.);\r
- TH2F * hHitsZNAh = new TH2F("hHitsZNAh", "Hits centroid in ZNA;Centroid position [cm];Counts", 100, -5.,5.,100,-5.,5.);\r
- Add2HitsList(hHitsZNCh, 12, !expert, image);\r
- Add2HitsList(hHitsZNAh, 13, !expert, image);\r
- // NB -> For the moment no check is performesd on ZP centroids\r
- TH2F * hHitsZPCh = new TH2F("hHitsZPCh", "Hits centroid in ZPC;Centroid position [cm];Counts", 100,-12.,12.,100,-12.,12.); \r
- TH2F * hHitsZPAh = new TH2F("hHitsZPAh", "Hits centroid in ZPA;Centroid position [cm];Counts", 100,-12.,12.,100,-12.,12.); \r
- Add2HitsList(hHitsZPCh, 14, !expert, image);\r
- Add2HitsList(hHitsZPAh, 15, !expert, image);\r
+ ClonePerTrigClass(AliQAv1::kHITS); // this should be the last line\r
}\r
\r
\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., 6000.);\r
- TH1F * hDigZPATotlg = new TH1F("hDigZPATotlg", "Digit lg signal in ZPA", 100, 0., 6000.);\r
- Add2DigitsList(hDigZNCTotlg, 12, expert, !image);\r
- Add2DigitsList(hDigZNATotlg, 13, expert, !image);\r
- Add2DigitsList(hDigZPCTotlg, 14, expert, !image);\r
- Add2DigitsList(hDigZPATotlg, 15, expert, !image);\r
//\r
- TH1F * hDigSumQZNClg = new TH1F("hDigSumQZNClg", "Signal in 4 ZNC PMQlg",100, 0., 4000.);\r
- TH1F * hDigSumQZNAlg = new TH1F("hDigSumQZNAlg", "Signal in 4 ZNA PMQlg",100, 0., 4000.);\r
- TH1F * hDigSumQZPClg = new TH1F("hDigSumQZPClg", "Signal in 4 ZPC PMQlg",100, 0., 4000.);\r
- TH1F * hDigSumQZPAlg = new TH1F("hDigSumQZPAlg", "Signal in 4 ZPA PMQlg",100, 0., 4000.);\r
- Add2DigitsList(hDigSumQZNClg, 16, expert, !image);\r
- Add2DigitsList(hDigSumQZNAlg, 17, expert, !image);\r
- Add2DigitsList(hDigSumQZPClg, 18, expert, !image);\r
- Add2DigitsList(hDigSumQZPAlg, 19, expert, !image);\r
- //\r
- TH1F * hDigPMCZNClg = new TH1F("hDigPMCZNClg", "Signal in ZNC PMClg",100, 0., 4000.);\r
- TH1F * hDigPMCZNAlg = new TH1F("hDigPMCZNAlg", "Signal in ZNA PMClg",100, 0., 4000.);\r
- TH1F * hDigPMCZPClg = new TH1F("hDigPMCZPClg", "Signal in ZPC PMClg",100, 0., 4000.);\r
- TH1F * hDigPMCZPAlg = new TH1F("hDigPMCZPAlg", "Signal in ZPA PMClg",100, 0., 4000.);\r
- Add2DigitsList(hDigPMCZNClg, 20, expert, !image);\r
- Add2DigitsList(hDigPMCZNAlg, 21, expert, !image);\r
- Add2DigitsList(hDigPMCZPClg, 22, expert, !image);\r
- Add2DigitsList(hDigPMCZPAlg, 23, expert, !image);\r
-\r
+ ClonePerTrigClass(AliQAv1::kDIGITS); // this should be the last line\r
}\r
\r
//____________________________________________________________________________\r
adcSumQ_ZNC += hit->GetLightPMQ();\r
adcSum_ZNC += hit->GetLightPMC() + hit->GetLightPMQ();\r
//\r
- GetHitsData(8)->Fill(hit->GetLightPMQ());\r
- //\r
- GetHitsData(12)->Fill(hit->GetXImpact(),hit->GetYImpact()); \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
- GetHitsData(9)->Fill(hit->GetLightPMQ());\r
- //\r
- GetHitsData(13)->Fill(hit->GetXImpact(), hit->GetYImpact());\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
- GetHitsData(10)->Fill(hit->GetLightPMQ());\r
- //\r
- GetHitsData(14)->Fill(hit->GetXImpact(), hit->GetYImpact());\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
- GetHitsData(11)->Fill(hit->GetLightPMQ());\r
- //\r
- GetHitsData(15)->Fill(hit->GetXImpact(), hit->GetYImpact());\r
+ FillHitsData(11,hit->GetLightPMC());\r
}\r
//\r
- GetHitsData(0)->Fill(adcSum_ZNC);\r
- GetHitsData(1)->Fill(adcSum_ZNA);\r
- GetHitsData(2)->Fill(adcSum_ZPC);\r
- GetHitsData(3)->Fill(adcSum_ZPA);\r
+ FillHitsData(0,adcSum_ZNC);\r
+ FillHitsData(1,adcSum_ZNA);\r
+ FillHitsData(2,adcSum_ZPC);\r
+ FillHitsData(3,adcSum_ZPA);\r
//\r
- GetHitsData(4)->Fill(adcSumQ_ZNC);\r
- GetHitsData(5)->Fill(adcSumQ_ZNA);\r
- GetHitsData(6)->Fill(adcSumQ_ZPC);\r
- GetHitsData(7)->Fill(adcSumQ_ZPA);\r
+ FillHitsData(4,adcSumQ_ZNC);\r
+ FillHitsData(5,adcSumQ_ZNA);\r
+ FillHitsData(6,adcSumQ_ZPC);\r
+ FillHitsData(7,adcSumQ_ZPA);\r
}\r
}\r
\r
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
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
+ IncEvCountCycleHits();\r
+ IncEvCountTotalHits();\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
+ // 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
+ //adcSum_ZNC_lg += digit->GetADCValue(1);\r
//\r
if(digit->GetSector(1)!=0){\r
adcSumQ_ZNC += digit->GetADCValue(0);\r
- adcSumQ_ZNC_lg+= digit->GetADCValue(1);\r
+ //adcSumQ_ZNC_lg+= digit->GetADCValue(1);\r
}\r
else{\r
- GetDigitsData(8)->Fill(digit->GetADCValue(0));\r
- GetDigitsData(20)->Fill(digit->GetADCValue(1));\r
+ FillDigitsData(8,digit->GetADCValue(0));\r
+ //FillDigitsData(20,digit->GetADCValue(1));\r
}\r
}\r
else if(digit->GetSector(0)==2){\r
adcSum_ZPC += digit->GetADCValue(0);\r
- adcSum_ZPC_lg += digit->GetADCValue(1);\r
+ //adcSum_ZPC_lg += digit->GetADCValue(1);\r
//\r
if(digit->GetSector(1)!=0){\r
adcSumQ_ZPC += digit->GetADCValue(0);\r
- adcSumQ_ZPC_lg+= digit->GetADCValue(1);\r
+ //adcSumQ_ZPC_lg+= digit->GetADCValue(1);\r
}\r
else{\r
- GetDigitsData(10)->Fill(digit->GetADCValue(0));\r
- GetDigitsData(22)->Fill(digit->GetADCValue(1));\r
+ FillDigitsData(10,digit->GetADCValue(0));\r
+ //FillDigitsData(22,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
+ //adcSum_ZNA_lg += digit->GetADCValue(1);\r
//\r
if(digit->GetSector(1)!=0){\r
adcSumQ_ZNA += digit->GetADCValue(0);\r
- adcSumQ_ZNA_lg+= digit->GetADCValue(1);\r
+ //adcSumQ_ZNA_lg+= digit->GetADCValue(1);\r
}\r
else{\r
- GetDigitsData(9)->Fill(digit->GetADCValue(0));\r
- GetDigitsData(21)->Fill(digit->GetADCValue(1));\r
+ FillDigitsData(9,digit->GetADCValue(0));\r
+ //FillDigitsData(21,digit->GetADCValue(1));\r
}\r
}\r
else if(digit->GetSector(0)==5){\r
adcSum_ZPA += digit->GetADCValue(0);\r
- adcSum_ZPA_lg += digit->GetADCValue(1);\r
+ //adcSum_ZPA_lg += digit->GetADCValue(1);\r
//\r
if(digit->GetSector(1)!=0){\r
adcSumQ_ZPA += digit->GetADCValue(0);\r
- adcSumQ_ZPA_lg+= digit->GetADCValue(1);\r
+ //adcSumQ_ZPA_lg+= digit->GetADCValue(1);\r
}\r
else{\r
- GetDigitsData(11)->Fill(digit->GetADCValue(0));\r
- GetDigitsData(23)->Fill(digit->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_ZNA);\r
- GetDigitsData(2)->Fill(adcSum_ZPC);\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_ZNA);\r
- GetDigitsData(6)->Fill(adcSumQ_ZPC);\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_ZNA_lg);\r
- GetDigitsData(14)->Fill(adcSum_ZPC_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_ZNA_lg);\r
- GetDigitsData(18)->Fill(adcSumQ_ZPC_lg);\r
- GetDigitsData(19)->Fill(adcSumQ_ZPA_lg);\r
-\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
{\r
// Detector specific actions at end of cycle\r
// do the QA checking\r
+ ResetEventTrigClasses();\r
AliQAChecker::Instance()->Run(AliQAv1::kZDC, task, list); \r
}\r
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff