X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSQASPDDataMakerSim.cxx;fp=ITS%2FAliITSQASPDDataMakerSim.cxx;h=c1dda0109e730d145b2781b3c611a52e2cd7e3f1;hb=c71529b00c7900f5b40c760831acda8d0e1d6a38;hp=80a858a25f95bc92513b0cf47f7b12befaeae16b;hpb=af86c1fd9f539a1a1925a3371e8c26f6d83f2e14;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITSQASPDDataMakerSim.cxx b/ITS/AliITSQASPDDataMakerSim.cxx index 80a858a25f9..c1dda0109e7 100644 --- a/ITS/AliITSQASPDDataMakerSim.cxx +++ b/ITS/AliITSQASPDDataMakerSim.cxx @@ -52,9 +52,7 @@ fAliITSQADataMakerSim(aliITSQADataMakerSim), fSPDhDigits(0), fSPDhSDigits(0), fSPDhHits(0), -fDigitsOffset(0), -fSDigitsOffset(0), -fHitsOffset(0) +fGenOffset(0) { //ctor used to discriminate OnLine-Offline analysis } @@ -66,9 +64,7 @@ fAliITSQADataMakerSim(qadm.fAliITSQADataMakerSim), fSPDhDigits(qadm.fSPDhDigits), fSPDhSDigits(qadm.fSPDhSDigits), fSPDhHits(qadm.fSPDhHits), -fDigitsOffset(qadm.fDigitsOffset), -fSDigitsOffset(qadm.fSDigitsOffset), -fHitsOffset(qadm.fHitsOffset) +fGenOffset(qadm.fGenOffset) { //copy ctor fAliITSQADataMakerSim->SetName((const char*)qadm.fAliITSQADataMakerSim->GetName()) ; @@ -104,8 +100,7 @@ void AliITSQASPDDataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t /*task*/, TO void AliITSQASPDDataMakerSim::InitDigits() { // Initialization for DIGIT data - SPD - - - fDigitsOffset = (fAliITSQADataMakerSim->fDigitsQAList)->GetEntries(); + fGenOffset = (fAliITSQADataMakerSim->fDigitsQAList)->GetEntries(); //fSPDhDigits must be incremented by one unit every time a histogram is ADDED to the QA List Char_t name[50]; @@ -114,7 +109,7 @@ void AliITSQASPDDataMakerSim::InitDigits() TH1F *hlayer = new TH1F("LayPattern_SPD","Layer map - SPD",6,0.,6.); hlayer->GetXaxis()->SetTitle("Layer number"); hlayer->GetYaxis()->SetTitle("Entries"); - fAliITSQADataMakerSim->Add2DigitsList(hlayer,1+fDigitsOffset); + fAliITSQADataMakerSim->Add2DigitsList(hlayer,fGenOffset); fSPDhDigits++; TH1F **hmod = new TH1F*[2]; @@ -124,20 +119,20 @@ void AliITSQASPDDataMakerSim::InitDigits() hmod[iLay]=new TH1F(name,title,240,0,240); hmod[iLay]->GetXaxis()->SetTitle("Module number"); hmod[iLay]->GetYaxis()->SetTitle("Entries"); - fAliITSQADataMakerSim->Add2DigitsList(hmod[iLay],2+iLay+fDigitsOffset); + fAliITSQADataMakerSim->Add2DigitsList(hmod[iLay],1+iLay+fGenOffset); fSPDhDigits++; } TH1F *hcolumns = new TH1F("Columns_SPD","Columns - SPD",160,0.,160.); hcolumns->GetXaxis()->SetTitle("Column number"); hcolumns->GetYaxis()->SetTitle("Entries"); - fAliITSQADataMakerSim->Add2DigitsList(hcolumns,4+fDigitsOffset); + fAliITSQADataMakerSim->Add2DigitsList(hcolumns,3+fGenOffset); fSPDhDigits++; TH1F *hrows = new TH1F("Rows_SPD","Rows - SPD",256,0.,256.); hrows->GetXaxis()->SetTitle("Row number"); hrows->GetYaxis()->SetTitle("Entries"); - fAliITSQADataMakerSim->Add2DigitsList(hrows,5+fDigitsOffset); + fAliITSQADataMakerSim->Add2DigitsList(hrows,4+fGenOffset); fSPDhDigits++; TH1F** hMultSPDdigits = new TH1F*[2]; @@ -147,14 +142,14 @@ void AliITSQASPDDataMakerSim::InitDigits() hMultSPDdigits[iLay]=new TH1F(name,title,200,0.,200.); hMultSPDdigits[iLay]->GetXaxis()->SetTitle("Digit multiplicity"); hMultSPDdigits[iLay]->GetYaxis()->SetTitle("Entries"); - fAliITSQADataMakerSim->Add2DigitsList(hMultSPDdigits[iLay], 6+iLay+fDigitsOffset); + fAliITSQADataMakerSim->Add2DigitsList(hMultSPDdigits[iLay], 5+iLay+fGenOffset); fSPDhDigits++; } TH2F *hMultSPDdig2MultSPDdig1 = new TH2F("DigitMultCorrelation_SPD","Digit multiplicity correlation - SPD",200,0.,200.,200,0.,200.); hMultSPDdig2MultSPDdig1->GetXaxis()->SetTitle("Digit multiplicity (Layer 1)"); hMultSPDdig2MultSPDdig1->GetYaxis()->SetTitle("Digit multiplicity (Layer 2)"); - fAliITSQADataMakerSim->Add2DigitsList(hMultSPDdig2MultSPDdig1,8+fDigitsOffset); + fAliITSQADataMakerSim->Add2DigitsList(hMultSPDdig2MultSPDdig1,7+fGenOffset); fSPDhDigits++; AliDebug(1,Form("%d SPD Digits histograms booked\n",fSPDhDigits)); @@ -176,42 +171,43 @@ void AliITSQASPDDataMakerSim::MakeDigits(TTree *digits) digits->GetEvent(imod); Int_t ndigits = iITSdigits->GetEntries(); if (imod<80) { - fAliITSQADataMakerSim->GetDigitsData(1+fDigitsOffset)->Fill(0.5,ndigits); - fAliITSQADataMakerSim->GetDigitsData(2+fDigitsOffset)->Fill(imod,ndigits); + fAliITSQADataMakerSim->GetDigitsData(0+fGenOffset)->Fill(0.5,ndigits); + fAliITSQADataMakerSim->GetDigitsData(1+fGenOffset)->Fill(imod,ndigits); nDigitsL1+=ndigits; } else { - fAliITSQADataMakerSim->GetDigitsData(1+fDigitsOffset)->Fill(1,ndigits); - fAliITSQADataMakerSim->GetDigitsData(3+fDigitsOffset)->Fill(imod,ndigits); + fAliITSQADataMakerSim->GetDigitsData(0+fGenOffset)->Fill(1,ndigits); + fAliITSQADataMakerSim->GetDigitsData(2+fGenOffset)->Fill(imod,ndigits); nDigitsL2+=ndigits; } for (Int_t idig=0; idigUncheckedAt(idig); Int_t col=dig->GetCoord1(); // cell number z Int_t row=dig->GetCoord2(); // cell number x - fAliITSQADataMakerSim->GetDigitsData(4+fDigitsOffset)->Fill(col); - fAliITSQADataMakerSim->GetDigitsData(5+fDigitsOffset)->Fill(row); + fAliITSQADataMakerSim->GetDigitsData(3+fGenOffset)->Fill(col); + fAliITSQADataMakerSim->GetDigitsData(4+fGenOffset)->Fill(row); } } - fAliITSQADataMakerSim->GetDigitsData(6+fDigitsOffset)->Fill(nDigitsL1); - fAliITSQADataMakerSim->GetDigitsData(7+fDigitsOffset)->Fill(nDigitsL2); - fAliITSQADataMakerSim->GetDigitsData(8+fDigitsOffset)->Fill(nDigitsL1,nDigitsL2); + fAliITSQADataMakerSim->GetDigitsData(5+fGenOffset)->Fill(nDigitsL1); + fAliITSQADataMakerSim->GetDigitsData(6+fGenOffset)->Fill(nDigitsL2); + fAliITSQADataMakerSim->GetDigitsData(7+fGenOffset)->Fill(nDigitsL1,nDigitsL2); } //____________________________________________________________________________ void AliITSQASPDDataMakerSim::InitSDigits() { // Initialization for SDIGIT data - SPD - - fSDigitsOffset = (fAliITSQADataMakerSim->fSDigitsQAList)->GetEntries(); - + fGenOffset = (fAliITSQADataMakerSim->fSDigitsQAList)->GetEntries(); + //printf("--W-- AliITSQASPDDataMakerSim::InitSDigits() fGenOffset= %d \n",fGenOffset); //fSPDhSDigits must be incremented by one unit every time a histogram is ADDED to the QA List + Char_t name[50]; Char_t title[50]; TH1F *hlayer = new TH1F("LayPattern_SPD","Layer map - SPD",6,0.,6.); hlayer->GetXaxis()->SetTitle("Layer number"); hlayer->GetYaxis()->SetTitle("Entries"); - fAliITSQADataMakerSim->Add2SDigitsList(hlayer,1+fSDigitsOffset); + fAliITSQADataMakerSim->Add2SDigitsList(hlayer,fGenOffset); fSPDhSDigits++; TH1F **hmod = new TH1F*[2]; @@ -221,7 +217,7 @@ void AliITSQASPDDataMakerSim::InitSDigits() hmod[iLay]=new TH1F(name,title,240,0,240); hmod[iLay]->GetXaxis()->SetTitle("Module number"); hmod[iLay]->GetYaxis()->SetTitle("Entries"); - fAliITSQADataMakerSim->Add2SDigitsList(hmod[iLay],2+iLay+fSDigitsOffset); + fAliITSQADataMakerSim->Add2SDigitsList(hmod[iLay],1+iLay+fGenOffset); fSPDhSDigits++; } @@ -241,12 +237,12 @@ void AliITSQASPDDataMakerSim::MakeSDigits(TTree *sdigits) brchSDigits->GetEvent(imod); Int_t nsdig=sdig->GetEntries(); if (imod<80) { - fAliITSQADataMakerSim->GetSDigitsData(1+fSDigitsOffset)->Fill(0.5,nsdig); - fAliITSQADataMakerSim->GetSDigitsData(2+fSDigitsOffset)->Fill(imod,nsdig); + fAliITSQADataMakerSim->GetSDigitsData(0+fGenOffset)->Fill(0.5,nsdig); + fAliITSQADataMakerSim->GetSDigitsData(1+fGenOffset)->Fill(imod,nsdig); } else { - fAliITSQADataMakerSim->GetSDigitsData(1+fSDigitsOffset)->Fill(1,nsdig); - fAliITSQADataMakerSim->GetSDigitsData(3+fSDigitsOffset)->Fill(imod,nsdig); + fAliITSQADataMakerSim->GetSDigitsData(0+fGenOffset)->Fill(1,nsdig); + fAliITSQADataMakerSim->GetSDigitsData(2+fGenOffset)->Fill(imod,nsdig); } delete sdig; } @@ -257,8 +253,8 @@ void AliITSQASPDDataMakerSim::MakeSDigits(TTree *sdigits) void AliITSQASPDDataMakerSim::InitHits() { // Initialization for HITS data - SPD - - fHitsOffset = (fAliITSQADataMakerSim->fHitsQAList)->GetEntries(); - + fGenOffset = (fAliITSQADataMakerSim->fHitsQAList)->GetEntries(); + //printf("--W-- AliITSQASPDDataMakerSim::InitHits() fGenOffset= %d \n",fGenOffset); //fSPDhHits must be incremented by one unit every time a histogram is ADDED to the QA List Char_t name[50]; Char_t title[50]; @@ -266,7 +262,7 @@ void AliITSQASPDDataMakerSim::InitHits() TH1F *hlayer = new TH1F("LayPattern_SPD","Layer map - SPD",6,0.,6.); hlayer->GetXaxis()->SetTitle("Layer number"); hlayer->GetYaxis()->SetTitle("Entries"); - fAliITSQADataMakerSim->Add2HitsList(hlayer,1+fHitsOffset); + fAliITSQADataMakerSim->Add2HitsList(hlayer,fGenOffset); fSPDhHits++; TH1F **hmod = new TH1F*[2]; @@ -276,20 +272,20 @@ void AliITSQASPDDataMakerSim::InitHits() hmod[iLay]=new TH1F(name,title,240,0,240); hmod[iLay]->GetXaxis()->SetTitle("Module number"); hmod[iLay]->GetYaxis()->SetTitle("Entries"); - fAliITSQADataMakerSim->Add2HitsList(hmod[iLay],2+iLay+fHitsOffset); + fAliITSQADataMakerSim->Add2HitsList(hmod[iLay],1+iLay+fGenOffset); fSPDhHits++; } TH1F *hhitlenght = new TH1F("Lenght_SPD","Hit lenght along y_{loc} coord",210,0.,210.); hhitlenght->GetXaxis()->SetTitle("Hit lenght [#mum]"); hhitlenght->GetYaxis()->SetTitle("# hits"); - fAliITSQADataMakerSim->Add2HitsList(hhitlenght,4+fHitsOffset); + fAliITSQADataMakerSim->Add2HitsList(hhitlenght,3+fGenOffset); fSPDhHits++; TH1F *hEdepos = new TH1F("EnergyDeposit_SPD","Deposited energy distribution (y_{loc}>180 #mum)",150,0.,300.); hEdepos->GetXaxis()->SetTitle("Deposited energy [keV]"); hEdepos->GetYaxis()->SetTitle("# hits"); - fAliITSQADataMakerSim->Add2HitsList(hEdepos,5+fHitsOffset); + fAliITSQADataMakerSim->Add2HitsList(hEdepos,4+fGenOffset); fSPDhHits++; AliDebug(1,Form("%d SPD Hits histograms booked\n",fSPDhHits)); @@ -313,13 +309,12 @@ void AliITSQASPDDataMakerSim::MakeHits(TTree *hits) TObjArray *arrHits = module->GetHits(); Int_t nhits = arrHits->GetEntriesFast(); if (imod<80) { - fAliITSQADataMakerSim->GetHitsData(1+fHitsOffset)->Fill(0.5,nhits); - fAliITSQADataMakerSim->GetHitsData(2+fHitsOffset)->Fill(imod,nhits); + fAliITSQADataMakerSim->GetHitsData(fGenOffset)->Fill(0.5,nhits); + fAliITSQADataMakerSim->GetHitsData(1+fGenOffset)->Fill(imod,nhits); } else { - fAliITSQADataMakerSim->GetHitsData(1+fHitsOffset)->Fill(1,nhits); - fAliITSQADataMakerSim->GetHitsData(3+fHitsOffset)->Fill(imod,nhits); + fAliITSQADataMakerSim->GetHitsData(fGenOffset)->Fill(1,nhits); + fAliITSQADataMakerSim->GetHitsData(2+fGenOffset)->Fill(imod,nhits); } - //printf("--w--AliITSQASPDDataMakerSim::MakeHits nhits = %d\n",nhits); for (Int_t iHit=0; iHitAt(iHit); Double_t xl,yl,zl,xl0,yl0,zl0; @@ -327,10 +322,10 @@ void AliITSQASPDDataMakerSim::MakeHits(TTree *hits) hit->GetPositionL(xl,yl,zl,tof); hit->GetPositionL0(xl0,yl0,zl0,tof0); Float_t dyloc=TMath::Abs(yl-yl0)*10000.; - fAliITSQADataMakerSim->GetHitsData(4+fHitsOffset)->Fill(dyloc); + fAliITSQADataMakerSim->GetHitsData(3+fGenOffset)->Fill(dyloc); Float_t edep=hit->GetIonization()*1000000; if(dyloc>180.){ - fAliITSQADataMakerSim->GetHitsData(5+fHitsOffset)->Fill(edep); + fAliITSQADataMakerSim->GetHitsData(4+fGenOffset)->Fill(edep); } } }