X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCQADataMakerSim.cxx;h=a09812817c308f90fc15eb821d738e84a0f8998b;hb=c7d864655819885aeae5f0ed46c23200b0f4862c;hp=0159cb3d46811d86e3607da9e3bb389baa892cb6;hpb=fdc38bb27a884bc194302b4a70c1c3a64d34ab9b;p=u%2Fmrichter%2FAliRoot.git diff --git a/ZDC/AliZDCQADataMakerSim.cxx b/ZDC/AliZDCQADataMakerSim.cxx index 0159cb3d468..a09812817c3 100644 --- a/ZDC/AliZDCQADataMakerSim.cxx +++ b/ZDC/AliZDCQADataMakerSim.cxx @@ -17,7 +17,7 @@ #include // --- ROOT system --- #include -#include +#include #include #include #include @@ -28,24 +28,19 @@ #include "AliZDCQADataMakerSim.h" #include "AliZDCHit.h" #include "AliZDCDigit.h" -#include "AliZDCRawStream.h" ClassImp(AliZDCQADataMakerSim) //____________________________________________________________________________ AliZDCQADataMakerSim::AliZDCQADataMakerSim() : - AliQADataMakerSim(AliQA::GetDetName(AliQA::kZDC), "ZDC Quality Assurance Data Maker"), - fHits(0), - fDigit(0) + AliQADataMakerSim(AliQAv1::GetDetName(AliQAv1::kZDC), "ZDC Quality Assurance Data Maker") { // ctor } //____________________________________________________________________________ AliZDCQADataMakerSim::AliZDCQADataMakerSim(const AliZDCQADataMakerSim& qadm) : - AliQADataMakerSim(), - fHits(0), - fDigit(0) + AliQADataMakerSim() { //copy ctor SetName((const char*)qadm.GetName()); @@ -66,15 +61,45 @@ void AliZDCQADataMakerSim::InitHits() { // create Hits histograms in Hits subdir // - TH2F * hZNCh = new TH2F("hZNCh", "Hits centroid in ZNC", 100, -5.,5.,100,-5.,5.); - TH2F * hZNAh = new TH2F("hZNAh", "Hits centroid in ZNA", 100, -5.,5.,100,-5.,5.); + const Bool_t expert = kTRUE ; + const Bool_t image = kTRUE ; + + TH1F * hHitsZNCTot = new TH1F("hHitsZNCTot", "Signal in ZNC; N_{phe}", 100, 0., 6000.); + TH1F * hHitsZNATot = new TH1F("hHitsZNATot", "Signal in ZNA; N_{phe}", 100, 0., 6000.); + TH1F * hHitsZPCTot = new TH1F("hHitsZPCTot", "Signal in ZPC; N_{phe}", 100, 0., 6000.); + TH1F * hHitsZPATot = new TH1F("hHitsZPATot", "Signal in ZPA; N_{phe}", 100, 0., 6000.); + Add2HitsList(hHitsZNCTot, 0, !expert, image); + Add2HitsList(hHitsZNATot, 1, !expert, image); + Add2HitsList(hHitsZPCTot, 2, !expert, image); + Add2HitsList(hHitsZPATot, 3, !expert, image); + // + TH1F * hHitsSumQZNC = new TH1F("hHitsSumQZNC", "Signal in 4 ZNC PMQ; N_{phe}",100, 0., 4000.); + TH1F * hHitsSumQZNA = new TH1F("hHitsSumQZNA", "Signal in 4 ZNA PMQ; N_{phe}",100, 0., 4000.); + TH1F * hHitsSumQZPC = new TH1F("hHitsSumQZPC", "Signal in 4 ZPC PMQ; N_{phe}",100, 0., 4000.); + TH1F * hHitsSumQZPA = new TH1F("hHitsSumQZPA", "Signal in 4 ZPA PMQ; N_{phe}",100, 0., 4000.); + Add2HitsList(hHitsSumQZNC, 4, expert, !image); + Add2HitsList(hHitsSumQZNA, 5, expert, !image); + Add2HitsList(hHitsSumQZPC, 6, expert, !image); + Add2HitsList(hHitsSumQZPA, 7, expert, !image); + // + TH1F * hHitsPMCZNC = new TH1F("hHitsPMCZNC", "Signal in ZNC PMC; N_{phe}",100, 0., 4000.); + TH1F * hHitsPMCZNA = new TH1F("hHitsPMCZNA", "Signal in ZNA PMC; N_{phe}",100, 0., 4000.); + TH1F * hHitsPMCZPC = new TH1F("hHitsPMCZPC", "Signal in ZPC PMC; N_{phe}",100, 0., 4000.); + TH1F * hHitsPMCZPA = new TH1F("hHitsPMCZPA", "Signal in ZPA PMC; N_{phe}",100, 0., 4000.); + Add2HitsList(hHitsPMCZNC, 8, expert, !image); + Add2HitsList(hHitsPMCZNA, 9, expert, !image); + Add2HitsList(hHitsPMCZPC, 10, expert, !image); + Add2HitsList(hHitsPMCZPA, 11, expert, !image); + + TH2F * hHitsZNCh = new TH2F("hHitsZNCh", "Hits centroid in ZNC;Centroid position [cm];Counts", 100, -5.,5.,100,-5.,5.); + TH2F * hHitsZNAh = new TH2F("hHitsZNAh", "Hits centroid in ZNA;Centroid position [cm];Counts", 100, -5.,5.,100,-5.,5.); + Add2HitsList(hHitsZNCh, 12, !expert, image); + Add2HitsList(hHitsZNAh, 13, !expert, image); // NB -> For the moment no check is performesd on ZP centroids -// TH2F * hZPCh = new TH2F("hZPCh", "Hits centroid in ZPC", 100,-12.,12.,100,-12.,12.); -// TH2F * hZPAh = new TH2F("hZPAh", "Hits centroid in ZPA", 100,-12.,12.,100,-12.,12.); - Add2HitsList(hZNCh, 0); - Add2HitsList(hZNAh, 1); -// Add2HitsList(hZPCh, 2); -// Add2HitsList(hZPAh, 3); + TH2F * hHitsZPCh = new TH2F("hHitsZPCh", "Hits centroid in ZPC;Centroid position [cm];Counts", 100,-12.,12.,100,-12.,12.); + TH2F * hHitsZPAh = new TH2F("hHitsZPAh", "Hits centroid in ZPA;Centroid position [cm];Counts", 100,-12.,12.,100,-12.,12.); + Add2HitsList(hHitsZPCh, 14, !expert, image); + Add2HitsList(hHitsZPAh, 15, !expert, image); } @@ -83,89 +108,133 @@ void AliZDCQADataMakerSim::InitDigits() { // create Digits histograms in Digits subdir // + const Bool_t expert = kTRUE ; + const Bool_t image = kTRUE ; + // ------------------- HIGH GAIN CHAIN --------------------------- - TH1F * hDigZNCTot = new TH1F("hDigZNCTot", "Signal in ZNC", 100, 0., 6000.); - TH1F * hDigZNATot = new TH1F("hDigZNATot", "Signal in ZNA", 100, 0., 6000.); - TH1F * hDigZPCTot = new TH1F("hDigZPCTot", "Signal in ZPC", 100, 0., 6000.); - TH1F * hDigZPATot = new TH1F("hDigZPATot", "Signal in ZPA", 100, 0., 6000.); - Add2DigitsList(hDigZNCTot, 0); - Add2DigitsList(hDigZNATot, 1); - Add2DigitsList(hDigZPCTot, 2); - Add2DigitsList(hDigZPATot, 3); + TH1F * hDigZNCTot = new TH1F("hDigZNCTot", "Signal in ZNC;Amplitude [ADC counts];Counts", 100, 0., 6000.); + TH1F * hDigZNATot = new TH1F("hDigZNATot", "Signal in ZNA;Amplitude [ADC counts];Counts", 100, 0., 6000.); + TH1F * hDigZPCTot = new TH1F("hDigZPCTot", "Signal in ZPC;Amplitude [ADC counts];Counts", 100, 0., 6000.); + TH1F * hDigZPATot = new TH1F("hDigZPATot", "Signal in ZPA;Amplitude [ADC counts];Counts", 100, 0., 6000.); + Add2DigitsList(hDigZNCTot, 0, !expert, image); + Add2DigitsList(hDigZNATot, 1, !expert, image); + Add2DigitsList(hDigZPCTot, 2, !expert, image); + Add2DigitsList(hDigZPATot, 3, !expert, image); // - TH1F * hDigSumQZNC = new TH1F("hDigSumQZNC", "Signal in 4 ZNC PMQ",100, 0., 4000.); - TH1F * hDigSumQZNA = new TH1F("hDigSumQZNA", "Signal in 4 ZNA PMQ",100, 0., 4000.); - TH1F * hDigSumQZPC = new TH1F("hDigSumQZPC", "Signal in 4 ZPC PMQ",100, 0., 4000.); - TH1F * hDigSumQZPA = new TH1F("hDigSumQZPA", "Signal in 4 ZPA PMQ",100, 0., 4000.); - Add2DigitsList(hDigSumQZNC, 4); - Add2DigitsList(hDigSumQZNA, 5); - Add2DigitsList(hDigSumQZPC, 6); - Add2DigitsList(hDigSumQZPA, 7); + TH1F * hDigSumQZNC = new TH1F("hDigSumQZNC", "Signal in 4 ZNC PMQ;Amplitude [ADC counts];Counts",100, 0., 4000.); + TH1F * hDigSumQZNA = new TH1F("hDigSumQZNA", "Signal in 4 ZNA PMQ;Amplitude [ADC counts];Counts",100, 0., 4000.); + TH1F * hDigSumQZPC = new TH1F("hDigSumQZPC", "Signal in 4 ZPC PMQ;Amplitude [ADC counts];Counts",100, 0., 4000.); + TH1F * hDigSumQZPA = new TH1F("hDigSumQZPA", "Signal in 4 ZPA PMQ;Amplitude [ADC counts];Counts",100, 0., 4000.); + Add2DigitsList(hDigSumQZNC, 4, expert, !image); + Add2DigitsList(hDigSumQZNA, 5, expert, !image); + Add2DigitsList(hDigSumQZPC, 6, expert, !image); + Add2DigitsList(hDigSumQZPA, 7, expert, !image); // - TH1F * hDigPMCZNC = new TH1F("hDigPMCZNC", "Signal in ZNC PMC",100, 0., 4000.); - TH1F * hDigPMCZNA = new TH1F("hDigPMCZNA", "Signal in ZNA PMC",100, 0., 4000.); - TH1F * hDigPMCZPC = new TH1F("hDigPMCZPC", "Signal in ZPC PMC",100, 0., 4000.); - TH1F * hDigPMCZPA = new TH1F("hDigPMCZPA", "Signal in ZPA PMC",100, 0., 4000.); - Add2DigitsList(hDigPMCZNC, 8); - Add2DigitsList(hDigPMCZNA, 9); - Add2DigitsList(hDigPMCZPC, 10); - Add2DigitsList(hDigPMCZPA, 11); + TH1F * hDigPMCZNC = new TH1F("hDigPMCZNC", "Signal in ZNC PMC;Amplitude [ADC counts];Counts",100, 0., 4000.); + TH1F * hDigPMCZNA = new TH1F("hDigPMCZNA", "Signal in ZNA PMC;Amplitude [ADC counts];Counts",100, 0., 4000.); + TH1F * hDigPMCZPC = new TH1F("hDigPMCZPC", "Signal in ZPC PMC;Amplitude [ADC counts];Counts",100, 0., 4000.); + TH1F * hDigPMCZPA = new TH1F("hDigPMCZPA", "Signal in ZPA PMC;Amplitude [ADC counts];Counts",100, 0., 4000.); + Add2DigitsList(hDigPMCZNC, 8, expert, !image); + Add2DigitsList(hDigPMCZNA, 9, expert, !image); + Add2DigitsList(hDigPMCZPC, 10, expert, !image); + Add2DigitsList(hDigPMCZPA, 11, expert, !image); // // ------------------- LOW GAIN CHAIN --------------------------- -/* TH1F * hDigZNCTotlg = new TH1F("hDigZNCTotlg", "Digit lg signal in ZNC", 100, 0., 6000.); + TH1F * hDigZNCTotlg = new TH1F("hDigZNCTotlg", "Digit lg signal in ZNC", 100, 0., 6000.); TH1F * hDigZNATotlg = new TH1F("hDigZNATotlg", "Digit lg signal in ZNA", 100, 0., 6000.); TH1F * hDigZPCTotlg = new TH1F("hDigZPCTotlg", "Digit lg signal in ZPC", 100, 0., 6000.); TH1F * hDigZPATotlg = new TH1F("hDigZPATotlg", "Digit lg signal in ZPA", 100, 0., 6000.); - Add2DigitsList(hDigZNCTotlg, 12); - Add2DigitsList(hDigZNATotlg, 13); - Add2DigitsList(hDigZPCTotlg, 14); - Add2DigitsList(hDigZPATotlg, 15); + Add2DigitsList(hDigZNCTotlg, 12, expert, !image); + Add2DigitsList(hDigZNATotlg, 13, expert, !image); + Add2DigitsList(hDigZPCTotlg, 14, expert, !image); + Add2DigitsList(hDigZPATotlg, 15, expert, !image); // TH1F * hDigSumQZNClg = new TH1F("hDigSumQZNClg", "Signal in 4 ZNC PMQlg",100, 0., 4000.); TH1F * hDigSumQZNAlg = new TH1F("hDigSumQZNAlg", "Signal in 4 ZNA PMQlg",100, 0., 4000.); TH1F * hDigSumQZPClg = new TH1F("hDigSumQZPClg", "Signal in 4 ZPC PMQlg",100, 0., 4000.); TH1F * hDigSumQZPAlg = new TH1F("hDigSumQZPAlg", "Signal in 4 ZPA PMQlg",100, 0., 4000.); - Add2DigitsList(hDigSumQZNClg, 16); - Add2DigitsList(hDigSumQZNAlg, 17); - Add2DigitsList(hDigSumQZPClg, 18); - Add2DigitsList(hDigSumQZPAlg, 19); + Add2DigitsList(hDigSumQZNClg, 16, expert, !image); + Add2DigitsList(hDigSumQZNAlg, 17, expert, !image); + Add2DigitsList(hDigSumQZPClg, 18, expert, !image); + Add2DigitsList(hDigSumQZPAlg, 19, expert, !image); // TH1F * hDigPMCZNClg = new TH1F("hDigPMCZNClg", "Signal in ZNC PMClg",100, 0., 4000.); TH1F * hDigPMCZNAlg = new TH1F("hDigPMCZNAlg", "Signal in ZNA PMClg",100, 0., 4000.); TH1F * hDigPMCZPClg = new TH1F("hDigPMCZPClg", "Signal in ZPC PMClg",100, 0., 4000.); TH1F * hDigPMCZPAlg = new TH1F("hDigPMCZPAlg", "Signal in ZPA PMClg",100, 0., 4000.); - Add2DigitsList(hDigPMCZNClg, 20); - Add2DigitsList(hDigPMCZNAlg, 21); - Add2DigitsList(hDigPMCZPClg, 22); - Add2DigitsList(hDigPMCZPAlg, 23); -*/ + Add2DigitsList(hDigPMCZNClg, 20, expert, !image); + Add2DigitsList(hDigPMCZNAlg, 21, expert, !image); + Add2DigitsList(hDigPMCZPClg, 22, expert, !image); + Add2DigitsList(hDigPMCZPAlg, 23, expert, !image); + } //____________________________________________________________________________ -void AliZDCQADataMakerSim::MakeHits(TClonesArray * /*data*/) +void AliZDCQADataMakerSim::MakeHits() { //filling QA histos for Hits - // - TIter next(fHits); - AliZDCHit * hit; - while((hit = dynamic_cast(next()))){ - if(hit->GetVolume(0)==1) GetHitsData(0)->Fill(hit->GetXImpact(),hit->GetYImpact()); - else if(hit->GetVolume(0)==4) GetHitsData(1)->Fill(hit->GetXImpact(), hit->GetYImpact()); -// else if(hit->GetVolume(0)==2) GetHitsData(1)->Fill(hit->GetXImpact(), hit->GetYImpact()); -// else if(hit->GetVolume(0)==5) GetHitsData(3)->Fill(hit->GetXImpact(), hit->GetYImpact()); + + // Check id histograms already created for this Event Specie + if( !GetHitsData(0) ) InitHits(); + + TIter next(fHitsArray); + AliZDCHit * hit; + Float_t adcSum_ZNC=0., adcSum_ZNA=0., adcSum_ZPC=0., adcSum_ZPA=0.; + Float_t adcSumQ_ZNC=0., adcSumQ_ZNA=0., adcSumQ_ZPC=0., adcSumQ_ZPA=0.; + while((hit = dynamic_cast(next()))){ + if(hit->GetVolume(0)==1){ + adcSumQ_ZNC += hit->GetLightPMQ(); + adcSum_ZNC += hit->GetLightPMC() + hit->GetLightPMQ(); + // + GetHitsData(8)->Fill(hit->GetLightPMQ()); + // + GetHitsData(12)->Fill(hit->GetXImpact(),hit->GetYImpact()); + } + else if(hit->GetVolume(0)==4){ + adcSumQ_ZNA += hit->GetLightPMQ(); + adcSum_ZNA += hit->GetLightPMC() + hit->GetLightPMQ(); + // + GetHitsData(9)->Fill(hit->GetLightPMQ()); + // + GetHitsData(13)->Fill(hit->GetXImpact(), hit->GetYImpact()); + } + else if(hit->GetVolume(0)==2){ + adcSumQ_ZNC += hit->GetLightPMQ(); + adcSum_ZNC += hit->GetLightPMC() + hit->GetLightPMQ(); + // + GetHitsData(10)->Fill(hit->GetLightPMQ()); + // + GetHitsData(14)->Fill(hit->GetXImpact(), hit->GetYImpact()); } + else if(hit->GetVolume(0)==5){ + adcSumQ_ZNC += hit->GetLightPMQ(); + adcSum_ZNC += hit->GetLightPMC() + hit->GetLightPMQ(); + // + GetHitsData(11)->Fill(hit->GetLightPMQ()); + // + GetHitsData(15)->Fill(hit->GetXImpact(), hit->GetYImpact()); + } + // + GetHitsData(0)->Fill(adcSum_ZNC); + GetHitsData(1)->Fill(adcSum_ZNA); + GetHitsData(2)->Fill(adcSum_ZPC); + GetHitsData(3)->Fill(adcSum_ZPA); + // + GetHitsData(4)->Fill(adcSumQ_ZNC); + GetHitsData(5)->Fill(adcSumQ_ZNA); + GetHitsData(6)->Fill(adcSumQ_ZPC); + GetHitsData(7)->Fill(adcSumQ_ZPA); + } } //___________________________________________________________________________ void AliZDCQADataMakerSim::MakeHits(TTree * hitTree) { // make QA data from Hit Tree - // if(!hitTree){ - AliError("Hit Tree not found!"); - return; - } - // + AliError("Can't get ZDC hit tree!!"); + return; + } TBranch * branch = hitTree->GetBranch("ZDC") ; @@ -173,110 +242,98 @@ void AliZDCQADataMakerSim::MakeHits(TTree * hitTree) AliError("ZDC branch in Hit Tree not found!"); return; } - else{ - char** add = (char**) (branch->GetAddress()); - if(add){ - fHits = (TClonesArray*)(*add); - } - else{ - if(!fHits) fHits = new TClonesArray("AliZDCHit", 1000); - branch->SetAddress(&fHits); - } - Int_t ntracks = (Int_t) hitTree->GetEntries(); - //printf("\n\t *** no.track %d\n",ntracks); - if (ntracks<=0) return; - // - for(Int_t itrack=0; itrackGetEntry(itrack); - // - //printf("\t *** track %d",itrack); - //hits->Print(""); - //printf("\n"); - // - MakeHits(); - fHits->Clear(); - } - } + + if(fHitsArray) fHitsArray->Clear() ; + else fHitsArray = new TClonesArray("AliZDCHit", 1000); + + branch->SetAddress(&fHitsArray) ; + for (Int_t ientry = 0 ; ientry < branch->GetEntries() ; ientry++) { + branch->GetEntry(ientry) ; + MakeHits() ; + fHitsArray->Clear() ; + } + } //___________________________________________________________________________ -void AliZDCQADataMakerSim::MakeDigits(TTree *digitTree ) +void AliZDCQADataMakerSim::MakeDigits(TTree *digitTree) { // makes data from Digit Tree + if( !GetDigitsData(0) ) InitDigits(); + + if(!digitTree){ + AliError("Can't get ZDC digit tree!!"); + return; + } + TBranch * branch = digitTree->GetBranch("ZDC"); if(!branch){ - AliError("ZDC branch in Digit Tree not found"); + AliError("ZDC branch in digit tree not found"); return; } - char** add = (char**) (branch->GetAddress()); - if(add){ - fDigit = (AliZDCDigit*)(*add); - } - else{ - if(!fDigit) fDigit = new AliZDCDigit(); - branch->SetAddress(&fDigit); - } - - Int_t ndig = digitTree->GetEntries(); - + + AliZDCDigit *digit = 0x0; + branch->SetAddress(&digit); + Float_t adcSum_ZNC=0., adcSum_ZNA=0., adcSum_ZPC=0., adcSum_ZPA=0.; Float_t adcSumQ_ZNC=0., adcSumQ_ZNA=0., adcSumQ_ZPC=0., adcSumQ_ZPA=0.; - //Float_t adcSum_ZNC_lg=0., adcSum_ZNA_lg=0., adcSum_ZPC_lg=0., adcSum_ZPA_lg=0.; - //Float_t adcSumQ_ZNC_lg=0., adcSumQ_ZNA_lg=0., adcSumQ_ZPC_lg=0., adcSumQ_ZPA_lg=0.; - // - for(Int_t i = 0; i < ndig; i++){ - digitTree->GetEntry(i); - if(fDigit->GetSector(0)==1){ - adcSum_ZNC += fDigit->GetADCValue(0); - //adcSum_ZNC_lg += fDigit->GetADCValue(1); + Float_t adcSum_ZNC_lg=0., adcSum_ZNA_lg=0., adcSum_ZPC_lg=0., adcSum_ZPA_lg=0.; + Float_t adcSumQ_ZNC_lg=0., adcSumQ_ZNA_lg=0., adcSumQ_ZPC_lg=0., adcSumQ_ZPA_lg=0.; + + Int_t ndig = digitTree->GetEntries(); + for(Int_t i=0; iGetEntry(i); + + if(digit->GetSector(0)==1 && digit->GetSector(1)!=5){ + adcSum_ZNC += digit->GetADCValue(0); + adcSum_ZNC_lg += digit->GetADCValue(1); // - if(fDigit->GetSector(1)!=0){ - adcSumQ_ZNC += fDigit->GetADCValue(0); - //adcSumQ_ZNC_lg+= fDigit->GetADCValue(1); + if(digit->GetSector(1)!=0){ + adcSumQ_ZNC += digit->GetADCValue(0); + adcSumQ_ZNC_lg+= digit->GetADCValue(1); } else{ - GetDigitsData(8)->Fill(fDigit->GetADCValue(0)); - //GetDigitsData(20)->Fill(fDigit->GetADCValue(1)); + GetDigitsData(8)->Fill(digit->GetADCValue(0)); + GetDigitsData(20)->Fill(digit->GetADCValue(1)); } } - else if(fDigit->GetSector(0)==2){ - adcSum_ZPC += fDigit->GetADCValue(0); - //adcSum_ZPC_lg += fDigit->GetADCValue(1); + else if(digit->GetSector(0)==2){ + adcSum_ZPC += digit->GetADCValue(0); + adcSum_ZPC_lg += digit->GetADCValue(1); // - if(fDigit->GetSector(1)!=0){ - adcSumQ_ZPC += fDigit->GetADCValue(0); - //adcSumQ_ZPC_lg+= fDigit->GetADCValue(1); + if(digit->GetSector(1)!=0){ + adcSumQ_ZPC += digit->GetADCValue(0); + adcSumQ_ZPC_lg+= digit->GetADCValue(1); } else{ - GetDigitsData(10)->Fill(fDigit->GetADCValue(0)); - //GetDigitsData(22)->Fill(fDigit->GetADCValue(1)); + GetDigitsData(10)->Fill(digit->GetADCValue(0)); + GetDigitsData(22)->Fill(digit->GetADCValue(1)); } } - else if(fDigit->GetSector(0)==4){ - adcSum_ZNA += fDigit->GetADCValue(0); - //adcSum_ZNA_lg += fDigit->GetADCValue(1); + else if(digit->GetSector(0)==4 && digit->GetSector(1)!=5){ + adcSum_ZNA += digit->GetADCValue(0); + adcSum_ZNA_lg += digit->GetADCValue(1); // - if(fDigit->GetSector(1)!=0){ - adcSumQ_ZNA += fDigit->GetADCValue(0); - //adcSumQ_ZNA_lg+= fDigit->GetADCValue(1); + if(digit->GetSector(1)!=0){ + adcSumQ_ZNA += digit->GetADCValue(0); + adcSumQ_ZNA_lg+= digit->GetADCValue(1); } else{ - GetDigitsData(9)->Fill(fDigit->GetADCValue(0)); - //GetDigitsData(21)->Fill(fDigit->GetADCValue(1)); + GetDigitsData(9)->Fill(digit->GetADCValue(0)); + GetDigitsData(21)->Fill(digit->GetADCValue(1)); } } - else if(fDigit->GetSector(0)==5){ - adcSum_ZPA += fDigit->GetADCValue(0); - //adcSum_ZPA_lg += fDigit->GetADCValue(1); + else if(digit->GetSector(0)==5){ + adcSum_ZPA += digit->GetADCValue(0); + adcSum_ZPA_lg += digit->GetADCValue(1); // - if(fDigit->GetSector(1)!=0){ - adcSumQ_ZPA += fDigit->GetADCValue(0); - //adcSumQ_ZPA_lg+= fDigit->GetADCValue(1); + if(digit->GetSector(1)!=0){ + adcSumQ_ZPA += digit->GetADCValue(0); + adcSumQ_ZPA_lg+= digit->GetADCValue(1); } else{ - GetDigitsData(11)->Fill(fDigit->GetADCValue(0)); - //GetDigitsData(23)->Fill(fDigit->GetADCValue(1)); + GetDigitsData(11)->Fill(digit->GetADCValue(0)); + GetDigitsData(23)->Fill(digit->GetADCValue(1)); } } } @@ -291,7 +348,7 @@ void AliZDCQADataMakerSim::MakeDigits(TTree *digitTree ) GetDigitsData(6)->Fill(adcSumQ_ZPC); GetDigitsData(7)->Fill(adcSumQ_ZPA); // - /*GetDigitsData(12)->Fill(adcSum_ZNC_lg); + GetDigitsData(12)->Fill(adcSum_ZNC_lg); GetDigitsData(13)->Fill(adcSum_ZNA_lg); GetDigitsData(14)->Fill(adcSum_ZPC_lg); GetDigitsData(15)->Fill(adcSum_ZPA_lg); @@ -299,7 +356,8 @@ void AliZDCQADataMakerSim::MakeDigits(TTree *digitTree ) GetDigitsData(16)->Fill(adcSumQ_ZNC_lg); GetDigitsData(17)->Fill(adcSumQ_ZNA_lg); GetDigitsData(18)->Fill(adcSumQ_ZPC_lg); - GetDigitsData(19)->Fill(adcSumQ_ZPA_lg);*/ + GetDigitsData(19)->Fill(adcSumQ_ZPA_lg); + } //____________________________________________________________________________ @@ -310,9 +368,9 @@ void AliZDCQADataMakerSim::StartOfDetectorCycle() } //____________________________________________________________________________ -void AliZDCQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray * list) +void AliZDCQADataMakerSim::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArray ** list) { // Detector specific actions at end of cycle // do the QA checking - AliQAChecker::Instance()->Run(AliQA::kZDC, task, list); + AliQAChecker::Instance()->Run(AliQAv1::kZDC, task, list); }