X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=ITS%2FAliITSQASSDDataMakerRec.cxx;h=76a261aeb57bd9c466d02cd2168a2d3ac8ca8c5a;hp=59d71c22a5a408b18c0f3a15a86420afe9efea1a;hb=09cd3cd002cc0594e742971fab6f95c6a69dac0e;hpb=0e8dbf2ea942e0b9dc5bcb696b1382c1a88b1834 diff --git a/ITS/AliITSQASSDDataMakerRec.cxx b/ITS/AliITSQASSDDataMakerRec.cxx index 59d71c22a5a..76a261aeb57 100644 --- a/ITS/AliITSQASSDDataMakerRec.cxx +++ b/ITS/AliITSQASSDDataMakerRec.cxx @@ -22,7 +22,7 @@ // INFN Torino // --- ROOT system --- -#include +#include #include #include #include @@ -31,6 +31,7 @@ // --- Standard library --- // --- AliRoot header files --- +#include "AliITSQADataMakerRec.h" #include "AliITSQASSDDataMakerRec.h" #include "AliQADataMakerRec.h" #include "AliLog.h" @@ -42,6 +43,7 @@ #include "AliITSgeomTGeo.h" #include "AliRawEventHeaderBase.h" #include "AliITSRecPoint.h" +#include "AliITSRecPointContainer.h" #include "AliITSdigitSSD.h" #include "AliITSBadChannelsSSDv2.h" @@ -52,38 +54,38 @@ ClassImp(AliITSQASSDDataMakerRec) AliITSQASSDDataMakerRec::AliITSQASSDDataMakerRec(AliITSQADataMakerRec *aliITSQADataMakerRec, Bool_t kMode, Int_t ldc) : TObject(), -fAliITSQADataMakerRec(aliITSQADataMakerRec), -fSSDEvent(0), -fSSDEventPerCycle(0), -fkOnline(kMode), -fLDC(ldc), -fSSDRawsOffset(0), fSSDRawsDAOffset(0), -fSSDRawsCommonLevelOffset(0), -fSSDhRawsTask(0), -fSSDhDigitsTask(0), -fSSDhRecPointsTask(0), -fGenRawsOffset(0), -fGenDigitsOffset(0), -fGenRecPointsOffset(0), -fCDBManager(0) { + fAliITSQADataMakerRec(aliITSQADataMakerRec), + fkOnline(kMode), + fLDC(ldc), + fSSDRawsOffset(0), fSSDRawsDAOffset(0), + fSSDRawsCommonLevelOffset(0), + fSSDhRawsTask(0), + fSSDhDigitsTask(0), + fSSDhRecPointsTask(0), + fGenRawsOffset(0), + fGenDigitsOffset(0), + fGenRecPointsOffset(0), + fCDBManager(0) { // Default constructor //initilize the raw signal vs strip number histograms - fGenRawsOffset = new Int_t[AliRecoParam::kNSpecies]; - fGenRecPointsOffset = new Int_t[AliRecoParam::kNSpecies]; - fGenDigitsOffset = new Int_t[AliRecoParam::kNSpecies]; - for(Int_t i=0; iSetDefaultStorage("local://$ALICE_ROOT/OCDB"); - //fCDBManager->SetDefaultStorage(gSystem->Getenv("AMORE_CDB_URI")); - Int_t runNumber = atoi(gSystem->Getenv("DATE_RUN_NUMBER")); - if(!runNumber) - AliWarning("DATE_RUN_NUMBER not defined!!!\n"); - + //fCDBManager->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); + fCDBManager->SetDefaultStorage(gSystem->Getenv("AMORE_CDB_URI")); + + Int_t runNumber = 1; + if(!gSystem->Getenv("DATE_RUN_NUMBER")) { + AliWarning("DATE_RUN_NUMBER not defined!!!\n"); } + else { + runNumber = atoi(gSystem->Getenv("DATE_RUN_NUMBER"));} fCDBManager->SetRun(runNumber); AliCDBEntry *geomGRP = fCDBManager->Get("GRP/Geometry/Data"); if(!geomGRP) AliWarning("GRP geometry not found!!!\n"); @@ -97,7 +99,7 @@ fCDBManager(0) { gTitle = "SSD_RawSignal_Layer"; gTitle += gLayer; gTitle += "_Ladder"; gTitle += gLadder; gTitle += "_Module"; gTitle += gModule; - fHistSSDRawSignalModule[gHistCounterRawSignal] = new TH1D(gTitle.Data(),gTitle.Data(), + fHistSSDRawSignalModule[gHistCounterRawSignal] = new TH1F(gTitle.Data(),gTitle.Data(), 2*fgkNumberOfPSideStrips,0,2*fgkNumberOfPSideStrips); gHistCounterRawSignal += 1; @@ -108,7 +110,7 @@ fCDBManager(0) { gTitle = "SSD_CM_PSide_Layer"; gTitle += gLayer; gTitle += "_Ladder"; gTitle += gLadder; gTitle += "_Module"; gTitle += gModule; - fHistSSDCMModule[gHistCounterCM] = new TH1D(gTitle.Data(),gTitle.Data(), + fHistSSDCMModule[gHistCounterCM] = new TH1F(gTitle.Data(),gTitle.Data(), 100,-50.,50.); fHistSSDCMModule[gHistCounterCM]->GetXaxis()->SetTitle("CM"); gHistCounterCM += 1; @@ -119,7 +121,7 @@ fCDBManager(0) { gTitle = "SSD_CM_NSide_Layer"; gTitle += gLayer; gTitle += "_Ladder"; gTitle += gLadder; gTitle += "_Module"; gTitle += gModule; - fHistSSDCMModule[gHistCounterCM] = new TH1D(gTitle.Data(),gTitle.Data(), + fHistSSDCMModule[gHistCounterCM] = new TH1F(gTitle.Data(),gTitle.Data(), 100,-50.,50.); fHistSSDCMModule[gHistCounterCM]->GetXaxis()->SetTitle("CM"); gHistCounterCM += 1; @@ -135,13 +137,11 @@ fCDBManager(0) { } } } - +/* //____________________________________________________________________________ AliITSQASSDDataMakerRec::AliITSQASSDDataMakerRec(const AliITSQASSDDataMakerRec& qadm) : TObject(), fAliITSQADataMakerRec(qadm.fAliITSQADataMakerRec), -fSSDEvent(qadm.fSSDEvent), -fSSDEventPerCycle(qadm.fSSDEventPerCycle), fkOnline(qadm.fkOnline), fLDC(qadm.fLDC), fSSDRawsOffset(qadm.fSSDRawsOffset), fSSDRawsDAOffset(qadm.fSSDRawsDAOffset), @@ -153,20 +153,20 @@ fGenRawsOffset(qadm.fGenRawsOffset), fGenDigitsOffset(qadm.fGenDigitsOffset), fGenRecPointsOffset(qadm.fGenRecPointsOffset), fCDBManager(qadm.fCDBManager) { - //copy ctor - fAliITSQADataMakerRec->SetName((const char*)qadm.fAliITSQADataMakerRec->GetName()) ; - fAliITSQADataMakerRec->SetTitle((const char*)qadm.fAliITSQADataMakerRec->GetTitle()); +//copy ctor +fAliITSQADataMakerRec->SetName((const char*)qadm.fAliITSQADataMakerRec->GetName()) ; +fAliITSQADataMakerRec->SetTitle((const char*)qadm.fAliITSQADataMakerRec->GetTitle()); } //__________________________________________________________________ AliITSQASSDDataMakerRec& AliITSQASSDDataMakerRec::operator = (const AliITSQASSDDataMakerRec& qac ) { - // Equal operator. - this->~AliITSQASSDDataMakerRec(); - new(this) AliITSQASSDDataMakerRec(qac); - return *this; +// Equal operator. +this->~AliITSQASSDDataMakerRec(); +new(this) AliITSQASSDDataMakerRec(qac); +return *this; } - +*/ //__________________________________________________________________ AliITSQASSDDataMakerRec::~AliITSQASSDDataMakerRec() { // destructor @@ -184,31 +184,35 @@ AliITSQASSDDataMakerRec::~AliITSQASSDDataMakerRec() { //____________________________________________________________________________ void AliITSQASSDDataMakerRec::StartOfDetectorCycle() { + // start of detector cycle + + if(fAliITSQADataMakerRec->ListExists(AliQAv1::kRAWS)==kFALSE)return; - if ( fAliITSQADataMakerRec->GetRawsData(0) == NULL ) // Raws not defined - return ; + //if ( fAliITSQADataMakerRec->GetRawsData(0) == NULL ) // Raws not defined + //return ; - //for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { - //if (!AliQAv1::Instance()->IsEventSpecieSet(specie)) continue; -//cout << "StartOfDetectorCycle: Event specie " << specie << " is set" << endl; + //for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { + //if (!AliQAv1::Instance()->IsEventSpecieSet(specie)) continue; + //cout << "StartOfDetectorCycle: Event specie " << specie << " is set" << endl; - //Detector specific actions at start of cycle - AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM::Start of SSD Cycle\n"); - //Int_t specie = fAliITSQADataMakerRec->GetEventSpecie(); + //Detector specific actions at start of cycle + AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM::Start of SSD Cycle\n"); + //Int_t specie = fAliITSQADataMakerRec->GetEventSpecie(); - //}//event specie loop + //}//event specie loop } //____________________________________________________________________________ -void AliITSQASSDDataMakerRec::ResetRawsMonitoredObjects() { +void AliITSQASSDDataMakerRec::ResetRawsMonitoredObjects() +{ //Resetting the raw data monitored objects //Data size per DDL //for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { //if (!AliQAv1::Instance()->IsEventSpecieSet(specie)) continue; - /*((TH1D *)(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+4)))->Reset(); - //Data size per LDC - ((TH1D *)(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+22)))->Reset();*/ + /*((TH1F *)(fAliITSQADataMakerRec->ResetRawsData(fGenRawsOffset[specie]+4))); + //Data size per LDC + ((TH1F *)(fAliITSQADataMakerRec->ResetRawsData(fGenRawsOffset[specie]+22)));*/ Int_t specie = fAliITSQADataMakerRec->GetEventSpecie(); //cout << "(AliITSQASSDDataMakerRec::ResetRawsMonitoredObjects): Event specie " << specie << " is set" << endl; //online part @@ -219,9 +223,9 @@ void AliITSQASSDDataMakerRec::ResetRawsMonitoredObjects() { }//module loop //for(Int_t iSSDOffset = 0; iSSDOffset < fSSDRawsCommonLevelOffset; iSSDOffset++) - //(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+iSSDOffset))->Reset(); + //(fAliITSQADataMakerRec->ResetRawsData(fGenRawsOffset[specie]+iSSDOffset)); //for(Int_t iSSDOffset = fSSDRawsCommonLevelOffset; iSSDOffset < fSSDRawsOffset; iSSDOffset++) - //(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+iSSDOffset))->Reset(); + //(fAliITSQADataMakerRec->ResetRawsData(fGenRawsOffset[specie]+iSSDOffset)); Int_t gHistPositionOccupancyPerLadder = 0; Int_t gLayer = 0, gLadder = 0, gModule = 0; @@ -231,162 +235,159 @@ void AliITSQASSDDataMakerRec::ResetRawsMonitoredObjects() { gHistPositionOccupancyPerLadder = (gLayer == 5) ? 2*(gLadder - 1) : 2*(gLadder - 1 + fgkSSDLADDERSLAYER5); //P-SIDE OCCUPANCY - fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+gHistPositionOccupancyPerLadder)->Reset(); + int offs = fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES; + fAliITSQADataMakerRec->ResetRawsData(offs+gHistPositionOccupancyPerLadder); //N-SIDE OCCUPANCY - fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+gHistPositionOccupancyPerLadder+1)->Reset(); - - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6))->Reset(); - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+1))->Reset(); + fAliITSQADataMakerRec->ResetRawsData(offs+gHistPositionOccupancyPerLadder+1); + // + fAliITSQADataMakerRec->ResetRawsData(offs+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6); + fAliITSQADataMakerRec->ResetRawsData(offs+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+1); }//module loop }//online flag - //}//event species loop + // } //____________________________________________________________________________ -void AliITSQASSDDataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArray* /*list*/) +void AliITSQASSDDataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArray** /*list*/) { - - //for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { - //if (!AliQAv1::Instance()->IsEventSpecieSet(specie)) continue; - //if (!AliQAv1::Instance(AliQAv1::GetDetIndex(GetName()))->IsEventSpecieSet(AliRecoParam::ConvertIndex(specie))) continue; - + // finalize ssd cycle + // Int_t specie = fAliITSQADataMakerRec->GetEventSpecie(); - fAliITSQADataMakerRec->SetEventSpecie(AliRecoParam::ConvertIndex(specie)); //cout << "(AliITSQASSDDataMakerRec::EndOfDetectorCycle): Event specie " << specie << " is set" << endl; // launch the QA checking AliDebug(AliQAv1::GetQADebugLevel(),"AliITSDM instantiates checker with Run(AliQAv1::kITS, task, list)\n"); AliDebug(AliQAv1::GetQADebugLevel(), Form("Offset: %d\n",fGenRawsOffset[specie])); //Printf("Offset: %d\n",fGenRawsOffset[specie]); - + if(task == AliQAv1::kRAWS) { - - // if (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]) != NULL ) { - //AliInfo(Form("Event type entries: %d - Physics events: %d"),((TH1D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]))->GetEntries(),((TH1D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]))->GetBinContent(((TH1D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]))->FindBin(7))); - //cout<<"(EndOfDetectorCycle) Event type entries: "<<((TH1D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]))->GetEntries()<< " type 7: " << ((TH1D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]))->GetBinContent(((TH1D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]))->FindBin(7)) << endl; - - //AliInfo(Form("SSD Data Size entries: %d"),((TH1D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+1))->GetEntries()); - //cout<<"SSD Data Size entries: "<<((TH1D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+1))->GetEntries()<GetRawsData(fGenRawsOffset[specie]+5+i))->GetMean(); - //cout<<"DDL: "<GetRawsData(fGenRawsOffset[specie]+5+i))->GetMean()<GetRawsData(fGenRawsOffset[specie]+5+i))->GetEntries()<GetRawsData(fGenRawsOffset[specie]+4)))->SetBinContent(i+1,gSizePerDDL); - //cout<<"After filling DDL: "<GetRawsData(fGenRawsOffset[specie]+4)))->GetBinContent(i+1)<GetRawsData(fGenRawsOffset[specie]+23+i))->GetMean(); - ((TH1D *)(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+22)))->SetBinContent(i+1,gSizePerLDC); - //cout<<"LDC: "<GetRawsData(fGenRawsOffset[specie]+23+i))->GetMean()<GetRawsData(fGenRawsOffset[specie]+4))->GetEntries()<< " mean: " << ((TH1D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+4))->GetMean()<GetRawsData(fGenRawsOffset[specie]+22))->GetEntries()<< " mean: " << ((TH1D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+22))->GetMean()<GetXaxis()->GetNbins(); iBins++) - fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule)->SetBinContent(iBins,fOccupancyMatrix[iModule][iBins-1]); - - if(fSSDEventPerCycle != 0) - ((TH1F *)(fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule)))->Scale(100./fSSDEventPerCycle); - }//module loop - - //AliInfo(Form("Entries occupancy 511/3: %d"),((TH1D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+222))->GetEntries()); - // cout<<"Entries occupancy 511/3 : "<<((TH1D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+222))->GetEntries()<GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),0,0,0); - occupancyThreshold = GetOccupancyModule((TH1 *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),0,1,3); - occupancyAverage = GetOccupancyModule((TH1 *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),0,2,0); - - fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+gHistPositionOccupancyPerLadder)->SetBinContent(gModule,occupancy); - lLadderLocationY = 3*gLadder; // sideP=1 sideN=0 - if(gLayer == 5) { - //occupancy per module - no threshold - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6))->SetBinContent(gModule,lLadderLocationY,occupancy); - //occupancy per module - threshold @ 3% - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+2))->SetBinContent(gModule,lLadderLocationY,occupancyThreshold); - //average occupancy per module - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+4))->SetBinContent(gModule,lLadderLocationY,occupancyAverage); - } - else if(gLayer == 6) { - //occupancy per module - no threshold - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+1))->SetBinContent(gModule,lLadderLocationY,occupancy); - //occupancy per module - threshold @ 3% - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+3))->SetBinContent(gModule,lLadderLocationY,occupancyThreshold); - //average occupancy per module - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+5))->SetBinContent(gModule,lLadderLocationY,occupancyAverage); - } - - //N-SIDE OCCUPANCY - occupancy = GetOccupancyModule((TH1 *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),1,0,0); - occupancyThreshold = GetOccupancyModule((TH1 *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),1,1,3); - occupancyAverage = GetOccupancyModule((TH1 *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+gHistPositionOccupancyPerModule),1,2,0); - - fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+gHistPositionOccupancyPerLadder+1)->SetBinContent(gModule,occupancy); - if(gLayer == 5) { - //occupancy per module - no threshold - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6))->SetBinContent(gModule,lLadderLocationY-1,occupancy); - //occupancy per module - threshold @ 3% - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+2))->SetBinContent(gModule,lLadderLocationY-1,occupancyThreshold); - //average occupancy per module - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+4))->SetBinContent(gModule,lLadderLocationY-1,occupancyAverage); - } - else if(gLayer == 6) { - //occupancy per module - no threshold - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+1))->SetBinContent(gModule,lLadderLocationY-1,occupancy); - //occupancy per module - threshold @ 3% - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+3))->SetBinContent(gModule,lLadderLocationY-1,occupancyThreshold); - //average occupancy per module - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+5))->SetBinContent(gModule,lLadderLocationY-1,occupancyAverage); + // + for (int trCl=-1;trClGetNTrigClasses();trCl++) { // RS Loop over all trigger classes (+ global counter, -1) + // + TObjArray &harr = *fAliITSQADataMakerRec->GetRawsDataOfTrigClass(trCl); + int offs = fGenRawsOffset[specie]; + int nSSDEventPerCycle = fAliITSQADataMakerRec->GetEvCountCycleRaws(trCl); + // + //Data size per DDL + for(Int_t i = 0; i < fgkNumOfDDLs; i++) { + if (!(harr[offs+5+i] && harr[offs+4+i])) continue; + Double_t gSizePerDDL = ((TH1*)harr[offs+5+i])->GetMean(); + //cout<<"DDL: "<GetEntries()<SetBinContent(i+1,gSizePerDDL); + //cout<<"After filling DDL: "<GetBinContent(i+1)<GetMean(); + ((TH1*)harr[offs+22])->SetBinContent(i+1,gSizePerLDC); + //cout<<"LDC: "<GetMean()<GetEntries()<< " mean: " << ((TH1*)harr[offs+4])->GetMean()<GetEntries()<< " mean: " << ((TH1*)harr[offs+22])->GetMean()<GetXaxis()->GetNbins(); iBins++) htmp->SetBinContent(iBins,fOccupancyMatrix[iModule][iBins-1]); + if(nSSDEventPerCycle != 0) htmp->Scale(100./nSSDEventPerCycle); + }//module loop } - }//module loop - }//online flag for SSD - - //AliInfo(Form("Entries 2d occupancy no thres- lay 5: %d"),((TH2D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6))->GetEntries()); - //cout<<"entries 2d occupancy thres- lay 6: "<<((TH2D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+3))->GetEntries()<< " mean: " << ((TH2D*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+3))->GetMean() << endl; //Somehow the other occupancy maps do give nonzero values for GetMean() here - - fSSDEventPerCycle = 0; - - //cout<<"Data size/ DDL entries: "<<((TH1D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[1]+4))->GetEntries()<< " mean: " << ((TH1D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[1]+4))->GetMean()<SetBinContent(gModule,occupancy); + lLadderLocationY = 3*gLadder; // sideP=1 sideN=0 + if(gLayer == 5) { + //occupancy per module - no threshold + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6]) ) h2t->SetBinContent(gModule,lLadderLocationY,occupancy); + //occupancy per module - threshold @ 3% + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+2]) ) h2t->SetBinContent(gModule,lLadderLocationY,occupancyThreshold); + //average occupancy per module + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+4]) ) h2t->SetBinContent(gModule,lLadderLocationY,occupancyAverage); + } + else if(gLayer == 6) { + //occupancy per module - no threshold + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+1]) ) h2t->SetBinContent(gModule,lLadderLocationY,occupancy); + //occupancy per module - threshold @ 3% + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+3]) ) h2t->SetBinContent(gModule,lLadderLocationY,occupancyThreshold); + //average occupancy per module + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+5]) ) h2t->SetBinContent(gModule,lLadderLocationY,occupancyAverage); + } + // + //N-SIDE OCCUPANCY + // + occupancy = GetOccupancyModule(htmpo,1,0,0); + occupancyThreshold = GetOccupancyModule(htmpo,1,1,3); + occupancyAverage = GetOccupancyModule(htmpo,1,2,0); + if ( (h1t=(TH1*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+gHistPositionOccupancyPerLadder+1]) ) h1t->SetBinContent(gModule,occupancy); + if(gLayer == 5) { + //occupancy per module - no threshold + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6]) ) h2t->SetBinContent(gModule,lLadderLocationY-1,occupancy); + //occupancy per module - threshold @ 3% + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+2]) ) h2t->SetBinContent(gModule,lLadderLocationY-1,occupancyThreshold); + //average occupancy per module + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+4]) ) h2t->SetBinContent(gModule,lLadderLocationY-1,occupancyAverage); + } + else if(gLayer == 6) { + //occupancy per module - no threshold + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+1]) ) h2t->SetBinContent(gModule,lLadderLocationY-1,occupancy); + //occupancy per module - threshold @ 3% + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+3]) ) h2t->SetBinContent(gModule,lLadderLocationY-1,occupancyThreshold); + //average occupancy per module + if ( (h2t=(TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+5]) ) h2t->SetBinContent(gModule,lLadderLocationY-1,occupancyAverage); + } + } // htmpo + }//module loop + }//online flag for SSD + // + //TH2* h2tmp = (TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6]; + //if (h2tmp) AliInfo(Form("Entries 2d occupancy no thres- lay 5: %d"),h2tmp->GetEntries()); + //h2tmp = (TH2*)harr[offs+fSSDRawsCommonLevelOffset+fgkSSDMODULES+2*fgkSSDLADDERSLAYER5+2*fgkSSDLADDERSLAYER6+3]; + //cout<<"entries 2d occupancy thres- lay 6: "<GetEntries()<< " mean: " << h2tmp->GetMean() << endl; //Somehow the other occupancy maps do give nonzero values for GetMean() here + // + // TH1* h1tmp = (TH1*)harr[fGenRawsOffset[1]+4]; + // if (h1tmp) cout<<"Data size/ DDL entries: "<GetEntries()<< " mean: " << h1tmp->GetMean()<Run( AliQAv1::kITS , task, list); + // + if (specie==4) ResetRawsMonitoredObjects(); }//raw data end of cycle - - //} //event specie loop + // + + // } //____________________________________________________________________________ @@ -402,7 +403,8 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { //if (!AliQAv1::Instance()->IsEventSpecieSet(specie)) continue; Int_t specie = fAliITSQADataMakerRec->GetEventSpecie(); //cout << "(AliITSQASSDDataMakerRec::InitRaws): Event specie " << specie << " is set" << endl; - //cout << "(AliITSQASSDDataMakerRec::InitRaws): Offset " << fGenRawsOffset[specie] << endl; + //cout << "(AliITSQASSDDataMakerRec::InitRaws): Offset " << offsRw << endl; + int offsRw = fGenRawsOffset[specie]; if(fkOnline) { @@ -411,72 +413,69 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { else { AliDebug(AliQAv1::GetQADebugLevel(), "Book Offline Histograms for SSD\n "); } - AliDebug(AliQAv1::GetQADebugLevel(), Form("Number of histograms (SPD+SDD): %d\n",fGenRawsOffset[specie])); + AliDebug(AliQAv1::GetQADebugLevel(), Form("Number of histograms (SPD+SDD): %d\n",offsRw)); TString gTitle; TString gName; //book online-offline QA histos - TH1D *fHistSSDEventType = new TH1D("fHistSSDEventType", + TH1F *fHistSSDEventType = new TH1F("fHistSSDEventType", "SSD Event Type;Event type;Events", 31,-1,30); - rv = fAliITSQADataMakerRec->Add2RawsList((new TH1D(*fHistSSDEventType)), - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + fHistSSDEventType->SetStats(kFALSE); + rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDEventType, + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; - delete fHistSSDEventType; - //cout<<"(AliITSQASSDDataMakerRec::InitRaws): "<GetRawsData(fGenRawsOffset[specie]))->GetName()<GetRawsData(offsRw))->GetName()<Add2RawsList((new TH1D(*fHistSSDDataSize)), - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); - delete fHistSSDDataSize; + rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSize, + offsRw+fSSDRawsOffset, !expert, image, !saveCorr); fSSDRawsOffset += 1; - TH1D *fHistSSDDataSizePercentage = new TH1D("fHistSSDDataSizePercentage", + TH1F *fHistSSDDataSizePercentage = new TH1F("fHistSSDDataSizePercentage", "SSD Data Size Percentage;SSD data size [%];Events", 1000,0,100); - rv = fAliITSQADataMakerRec->Add2RawsList((new TH1D(*fHistSSDDataSizePercentage)), - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); - delete fHistSSDDataSizePercentage; + rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizePercentage, + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; - TH1D *fHistSSDDDLId = new TH1D("fHistSSDDDLId", + TH1F *fHistSSDDDLId = new TH1F("fHistSSDDDLId", "SSD DDL Id;DDL id;Events",16,511.5,527.5); - rv = fAliITSQADataMakerRec->Add2RawsList((new TH1D(*fHistSSDDDLId)), - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); - delete fHistSSDDDLId; + fHistSSDDDLId->SetStats(kFALSE); + rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDDDLId, + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; - TH1D *fHistSSDDataSizePerDDL = new TH1D("fHistSSDDataSizePerDDL", + TH1F *fHistSSDDataSizePerDDL = new TH1F("fHistSSDDataSizePerDDL", "SSD Data Size Per DDL;DDL id; [KB]", 16,511.5,527.5); - rv = fAliITSQADataMakerRec->Add2RawsList((new TH1D(*fHistSSDDataSizePerDDL)), - fGenRawsOffset[specie]+fSSDRawsOffset, !expert, image, !saveCorr); - delete fHistSSDDataSizePerDDL; + fHistSSDDataSizePerDDL->SetStats(kFALSE); + rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizePerDDL, + offsRw+fSSDRawsOffset, !expert, image, !saveCorr); + fSSDRawsOffset += 1; - TH1D *fHistSSDDataSizeDDL[fgkNumOfDDLs]; + TH1F *fHistSSDDataSizeDDL[fgkNumOfDDLs]; for(Int_t i = 1; i < fgkNumOfDDLs+1; i++) { gName = Form("fHistSSDDataSizeDDL%d", i+511) ; gTitle = Form("SSD Data Size DDL %d", i+511) ; - fHistSSDDataSizeDDL[i-1] = new TH1D(gName.Data(), + fHistSSDDataSizeDDL[i-1] = new TH1F(gName.Data(), Form("%s;(SSD data size) [KB];Events", gTitle.Data()), 100,0,50); - rv = fAliITSQADataMakerRec->Add2RawsList((new TH1D(*fHistSSDDataSizeDDL[i-1])), - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizeDDL[i-1], + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; } - for(Int_t i = 1; i < fgkNumOfDDLs+1; i++) delete fHistSSDDataSizeDDL[i-1]; - TH1D *fHistSSDLDCId = new TH1D("fHistSSDLDCId","SSD LDC Id;LDC id;Events",8,169.5,177.5); - rv = fAliITSQADataMakerRec->Add2RawsList((new TH1D(*fHistSSDLDCId)), - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); - delete fHistSSDLDCId; + TH1F *fHistSSDLDCId = new TH1F("fHistSSDLDCId","SSD LDC Id;LDC id;Events",8,169.5,177.5); + fHistSSDLDCId->SetStats(kFALSE); + rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDLDCId, + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; - TH1D *fHistSSDDataSizePerLDC = new TH1D("fHistSSDDataSizePerLDC", + TH1F *fHistSSDDataSizePerLDC = new TH1F("fHistSSDDataSizePerLDC", "SSD Data Size Per LDC;LDC id; [KB]", 8,169.5,177.5); - rv = fAliITSQADataMakerRec->Add2RawsList((new TH1D(*fHistSSDDataSizePerLDC)), - fGenRawsOffset[specie]+fSSDRawsOffset, !expert, image, !saveCorr); - delete fHistSSDDataSizePerLDC; - fSSDRawsOffset += 1; - TH1D *fHistSSDDataSizeLDC[fgkNumOfLDCs]; + fHistSSDDataSizePerLDC->SetStats(kFALSE); + rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizePerLDC, + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; + TH1F *fHistSSDDataSizeLDC[fgkNumOfLDCs]; for(Int_t i = 1; i < fgkNumOfLDCs+1; i++) { gName = "fHistSSDDataSizeLDC"; if(i == 1) gName += "170"; @@ -489,20 +488,19 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { if(i == 8) gName += "177"; gTitle = "SSD Data Size LDC "; gTitle += gName.Data(); - fHistSSDDataSizeLDC[i-1] = new TH1D(gName.Data(), + fHistSSDDataSizeLDC[i-1] = new TH1F(gName.Data(), Form("%s;SSD data size [KB];Events", gTitle.Data()), 1000,0,100); - rv = fAliITSQADataMakerRec->Add2RawsList((new TH1D(*fHistSSDDataSizeLDC[i-1])), - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDDataSizeLDC[i-1], + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; } - for(Int_t i = 1; i < fgkNumOfLDCs+1; i++) delete fHistSSDDataSizeLDC[i-1]; fSSDRawsCommonLevelOffset = fSSDRawsOffset; if(fkOnline) { Int_t gLayer = 0, gLadder = 0, gModule = 0; //occupancy per SSD module - TH1D *fHistSSDOccupancyModule[fgkSSDMODULES]; + TH1F *fHistSSDOccupancyModule[fgkSSDMODULES]; for(Int_t i = 500; i < fgkSSDMODULES + 500; i++) { AliITSgeomTGeo::GetModuleId(i,gLayer,gLadder,gModule); gName = "fHistSSD_Occupancy_Layer"; @@ -522,17 +520,17 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { gName += "_Module"; gName += gModule; gTitle += "_Module"; gTitle += gModule; - fHistSSDOccupancyModule[i-500] = new TH1D(gName.Data(),Form("%s;N_{strip};Occupancy [%]", gTitle.Data()), + fHistSSDOccupancyModule[i-500] = new TH1F(gName.Data(),Form("%s;N_{strip};Occupancy [%%]", gTitle.Data()), 2*fgkNumberOfPSideStrips,0,2*fgkNumberOfPSideStrips); fHistSSDOccupancyModule[i-500]->GetXaxis()->SetTitleColor(1); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyModule[i-500], - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; } //Occupancy per SSD ladder Int_t occupancyCounter = 0; - TH1D *fHistSSDOccupancyLadder[2*(fgkSSDLADDERSLAYER5 + fgkSSDLADDERSLAYER6)]; + TH1F *fHistSSDOccupancyLadder[2*(fgkSSDLADDERSLAYER5 + fgkSSDLADDERSLAYER6)]; for(Int_t iLayer = 5; iLayer < 7; iLayer++) { for(Int_t iLadder = 1; iLadder < AliITSgeomTGeo::GetNLadders(iLayer) + 1; iLadder++) { //P-side occupancy plots @@ -552,13 +550,13 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { } gName += "_PSide"; gTitle += "_PSide"; - fHistSSDOccupancyLadder[occupancyCounter] = new TH1D(gName.Data(), - Form("%s;Module number;Occupancy [%]", gTitle.Data()), + fHistSSDOccupancyLadder[occupancyCounter] = new TH1F(gName.Data(), + Form("%s;Module number;Occupancy [%%]", gTitle.Data()), AliITSgeomTGeo::GetNDetectors(iLayer), 0.5,AliITSgeomTGeo::GetNDetectors(iLayer)+0.5); fHistSSDOccupancyLadder[occupancyCounter]->GetXaxis()->SetTitleColor(1); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyLadder[occupancyCounter], - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); occupancyCounter += 1; fSSDRawsOffset += 1; //N-side occupancy plots gName = "fHistSSD_Occupancy_Layer"; @@ -577,20 +575,20 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { } gName += "_NSide"; gTitle += "_NSide"; - fHistSSDOccupancyLadder[occupancyCounter] = new TH1D(gName.Data(), - Form("%s;Module number;Occupancy [%]", gTitle.Data()), + fHistSSDOccupancyLadder[occupancyCounter] = new TH1F(gName.Data(), + Form("%s;Module number;Occupancy [%%]", gTitle.Data()), AliITSgeomTGeo::GetNDetectors(iLayer), 0.5,AliITSgeomTGeo::GetNDetectors(iLayer)+0.5); fHistSSDOccupancyLadder[occupancyCounter]->GetXaxis()->SetTitleColor(1); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyLadder[occupancyCounter], - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); occupancyCounter += 1; fSSDRawsOffset += 1; }//ladder loop }//layer loop //top level occupancy plots //occupancy per module - no threshold - TH2D *fHistSSDOccupancyLayer5 = new TH2D("fHistSSDOccupancyLayer5", + TH2F *fHistSSDOccupancyLayer5 = new TH2F("fHistSSDOccupancyLayer5", "SSD Occupancy (Layer 5) - No threshold;N_{modules};N_{Ladders}", fgkSSDMODULESPERLADDERLAYER5, 0,fgkSSDMODULESPERLADDERLAYER5, @@ -599,13 +597,14 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { fHistSSDOccupancyLayer5->GetZaxis()->SetRangeUser(0.0,100.0); Char_t fLabel[3]; for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER5 + 1; iBin++){ - sprintf(fLabel,"%d",iBin); + snprintf(fLabel,2,"%d",iBin); fHistSSDOccupancyLayer5->GetXaxis()->SetBinLabel(iBin,fLabel); } + fHistSSDOccupancyLayer5->SetStats(kFALSE); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyLayer5, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; - TH2D *fHistSSDOccupancyLayer6 = new TH2D("fHistSSDOccupancyLayer6", + TH2F *fHistSSDOccupancyLayer6 = new TH2F("fHistSSDOccupancyLayer6", "Occupancy per module (Layer 6) - No threshold;N_{modules};N_{Ladders}", fgkSSDMODULESPERLADDERLAYER6, 0,fgkSSDMODULESPERLADDERLAYER6, @@ -613,15 +612,16 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { 600,600+fgkSSDLADDERSLAYER6); fHistSSDOccupancyLayer6->GetZaxis()->SetRangeUser(0.0,100.0); for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER6 + 1; iBin++){ - sprintf(fLabel,"%d",iBin); + snprintf(fLabel,2,"%d",iBin); fHistSSDOccupancyLayer6->GetXaxis()->SetBinLabel(iBin,fLabel); } + fHistSSDOccupancyLayer6->SetStats(kFALSE); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyLayer6, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; //occupancy per module - threshold @ 3% - TH2D *fHistSSDOccupancyThresholdLayer5 = new TH2D("fHistSSDOccupancyThresholdLayer5", + TH2F *fHistSSDOccupancyThresholdLayer5 = new TH2F("fHistSSDOccupancyThresholdLayer5", "Occupancy per module (Layer 5) - Threshold 3%;N_{modules};N_{Ladders};Entries", fgkSSDMODULESPERLADDERLAYER5, 0,fgkSSDMODULESPERLADDERLAYER5, @@ -629,13 +629,14 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { 500,500+fgkSSDLADDERSLAYER5); fHistSSDOccupancyThresholdLayer5->GetZaxis()->SetRangeUser(3.0,10.0); for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER5 + 1; iBin++){ - sprintf(fLabel,"%d",iBin); + snprintf(fLabel,2,"%d",iBin); fHistSSDOccupancyThresholdLayer5->GetXaxis()->SetBinLabel(iBin,fLabel); } + fHistSSDOccupancyThresholdLayer5->SetStats(kFALSE); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyThresholdLayer5, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; - TH2D *fHistSSDOccupancyThresholdLayer6 = new TH2D("fHistSSDOccupancyThresholdLayer6", + TH2F *fHistSSDOccupancyThresholdLayer6 = new TH2F("fHistSSDOccupancyThresholdLayer6", "Occupancy per module (Layer 6) - Threshold 3%;N_{modules};N_{Ladders}", fgkSSDMODULESPERLADDERLAYER6, 0,fgkSSDMODULESPERLADDERLAYER6, @@ -643,15 +644,16 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { 600,600+fgkSSDLADDERSLAYER6); fHistSSDOccupancyThresholdLayer6->GetZaxis()->SetRangeUser(3.0,10.0); for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER6 + 1; iBin++){ - sprintf(fLabel,"%d",iBin); + snprintf(fLabel,2,"%d",iBin); fHistSSDOccupancyThresholdLayer6->GetXaxis()->SetBinLabel(iBin,fLabel); } + fHistSSDOccupancyThresholdLayer6->SetStats(kFALSE); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDOccupancyThresholdLayer6, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; //Average occupancy per module - TH2D *fHistSSDAverageOccupancyLayer5 = new TH2D("fHistSSDAverageOccupancyLayer5", + TH2F *fHistSSDAverageOccupancyLayer5 = new TH2F("fHistSSDAverageOccupancyLayer5", "Average occupancy per module (Layer 5);N_{modules};N_{Ladders}", fgkSSDMODULESPERLADDERLAYER5, 0,fgkSSDMODULESPERLADDERLAYER5, @@ -659,13 +661,14 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { 500,500+fgkSSDLADDERSLAYER5); fHistSSDAverageOccupancyLayer5->GetZaxis()->SetRangeUser(0.0,5.0); for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER5 + 1; iBin++){ - sprintf(fLabel,"%d",iBin); + snprintf(fLabel,2,"%d",iBin); fHistSSDAverageOccupancyLayer5->GetXaxis()->SetBinLabel(iBin,fLabel); } + fHistSSDAverageOccupancyLayer5->SetStats(kFALSE); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDAverageOccupancyLayer5, - fGenRawsOffset[specie]+fSSDRawsOffset, !expert, image, !saveCorr); + offsRw+fSSDRawsOffset, !expert, image, !saveCorr); fSSDRawsOffset += 1; - TH2D *fHistSSDAverageOccupancyLayer6 = new TH2D("fHistSSDAverageOccupancyLayer6", + TH2F *fHistSSDAverageOccupancyLayer6 = new TH2F("fHistSSDAverageOccupancyLayer6", "Average occupancy per module (Layer 6);N_{modules};N_{Ladders}", fgkSSDMODULESPERLADDERLAYER6, 0,fgkSSDMODULESPERLADDERLAYER6, @@ -673,15 +676,16 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { 600,600+fgkSSDLADDERSLAYER6); fHistSSDAverageOccupancyLayer6->GetZaxis()->SetRangeUser(0.0,5.0); for(Int_t iBin = 1; iBin < fgkSSDMODULESPERLADDERLAYER6 + 1; iBin++){ - sprintf(fLabel,"%d",iBin); + snprintf(fLabel,2,"%d",iBin); fHistSSDAverageOccupancyLayer6->GetXaxis()->SetBinLabel(iBin,fLabel); } + fHistSSDAverageOccupancyLayer6->SetStats(kFALSE); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDAverageOccupancyLayer6, - fGenRawsOffset[specie]+fSSDRawsOffset, !expert, image, !saveCorr); + offsRw+fSSDRawsOffset, !expert, image, !saveCorr); fSSDRawsOffset += 1; //Output of the DA - TH2D *fHistSSDPSideBadChannelMapLayer5 = new TH2D("fHistSSDPSideBadChannelMapLayer5", + TH2F *fHistSSDPSideBadChannelMapLayer5 = new TH2F("fHistSSDPSideBadChannelMapLayer5", "Layer 5;N_{module};N_{ladder}", 22,1,23, 34,500,534); @@ -695,10 +699,10 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { fHistSSDPSideBadChannelMapLayer5->GetZaxis()->SetTitleOffset(1.6); fHistSSDPSideBadChannelMapLayer5->GetZaxis()->SetTitle("Bad channels (p-side)[%]"); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDPSideBadChannelMapLayer5, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; fSSDRawsDAOffset += 1; - TH2D *fHistSSDNSideBadChannelMapLayer5 = new TH2D("fHistSSDNSideBadChannelMapLayer5", + TH2F *fHistSSDNSideBadChannelMapLayer5 = new TH2F("fHistSSDNSideBadChannelMapLayer5", "Layer 5;N_{module};N_{ladder}", 22,1,23, 34,500,534); @@ -712,10 +716,10 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { fHistSSDNSideBadChannelMapLayer5->GetZaxis()->SetTitleOffset(1.6); fHistSSDNSideBadChannelMapLayer5->GetZaxis()->SetTitle("Bad channels (n-side)[%]"); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDNSideBadChannelMapLayer5, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; fSSDRawsDAOffset += 1; - TH2D *fHistSSDPSideBadChannelMapLayer6 = new TH2D("fHistSSDPSideBadChannelMapLayer6", + TH2F *fHistSSDPSideBadChannelMapLayer6 = new TH2F("fHistSSDPSideBadChannelMapLayer6", "Layer 6;N_{module};N_{ladder}", 25,1,26, 38,600,638); @@ -729,10 +733,10 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { fHistSSDPSideBadChannelMapLayer6->GetZaxis()->SetTitleOffset(1.6); fHistSSDPSideBadChannelMapLayer6->GetZaxis()->SetTitle("Bad channels (p-side)[%]"); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDPSideBadChannelMapLayer6, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; fSSDRawsDAOffset += 1; - TH2D *fHistSSDNSideBadChannelMapLayer6 = new TH2D("fHistSSDNSideBadChannelMapLayer6", + TH2F *fHistSSDNSideBadChannelMapLayer6 = new TH2F("fHistSSDNSideBadChannelMapLayer6", "Layer 6;N_{module};N_{ladder}", 25,1,26, 38,600,638); @@ -746,11 +750,11 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { fHistSSDNSideBadChannelMapLayer6->GetZaxis()->SetTitleOffset(1.6); fHistSSDNSideBadChannelMapLayer6->GetZaxis()->SetTitle("Bad channels (n-side)[%]"); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDNSideBadChannelMapLayer6, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; fSSDRawsDAOffset += 1; - //Common mode values - TH2D *fHistSSDPSideCommonModeMapLayer5 = new TH2D("fHistSSDPSideCommonModeMapLayer5", + //Common mode values + TH2F *fHistSSDPSideCommonModeMapLayer5 = new TH2F("fHistSSDPSideCommonModeMapLayer5", "Layer 5 - CM (P-side);N_{module};N_{ladder}", 22,1,23, 34,500,534); @@ -764,10 +768,10 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { fHistSSDPSideCommonModeMapLayer5->GetZaxis()->SetTitleOffset(1.6); fHistSSDPSideCommonModeMapLayer5->GetZaxis()->SetTitle("RMS(CM) (P-side)"); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDPSideCommonModeMapLayer5, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; fSSDRawsDAOffset += 1; - TH2D *fHistSSDNSideCommonModeMapLayer5 = new TH2D("fHistSSDNSideCommonModeMapLayer5", + TH2F *fHistSSDNSideCommonModeMapLayer5 = new TH2F("fHistSSDNSideCommonModeMapLayer5", "Layer 5 - CM (N-side);N_{module};N_{ladder}", 22,1,23, 34,500,534); @@ -781,10 +785,10 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { fHistSSDNSideCommonModeMapLayer5->GetZaxis()->SetTitleOffset(1.6); fHistSSDNSideCommonModeMapLayer5->GetZaxis()->SetTitle("RMS(CM) (N-side)"); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDNSideCommonModeMapLayer5, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; fSSDRawsDAOffset += 1; - TH2D *fHistSSDPSideCommonModeMapLayer6 = new TH2D("fHistSSDPSideCommonModeMapLayer6", + TH2F *fHistSSDPSideCommonModeMapLayer6 = new TH2F("fHistSSDPSideCommonModeMapLayer6", "Layer 6 - CM (P-side);N_{module};N_{ladder}", 25,1,26, 38,600,638); @@ -798,10 +802,10 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { fHistSSDPSideCommonModeMapLayer6->GetZaxis()->SetTitleOffset(1.6); fHistSSDPSideCommonModeMapLayer6->GetZaxis()->SetTitle("RMS(CM) (P-side)"); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDPSideCommonModeMapLayer6, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; fSSDRawsDAOffset += 1; - TH2D *fHistSSDNSideCommonModeMapLayer6 = new TH2D("fHistSSDNSideCommonModeMapLayer6", + TH2F *fHistSSDNSideCommonModeMapLayer6 = new TH2F("fHistSSDNSideCommonModeMapLayer6", "Layer 6 - CM (N-side);N_{module};N_{ladder}", 25,1,26, 38,600,638); @@ -815,21 +819,21 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { fHistSSDNSideCommonModeMapLayer6->GetZaxis()->SetTitleOffset(1.6); fHistSSDNSideCommonModeMapLayer6->GetZaxis()->SetTitle("RMS(CM) (N-side)"); rv = fAliITSQADataMakerRec->Add2RawsList(fHistSSDNSideCommonModeMapLayer6, - fGenRawsOffset[specie]+fSSDRawsOffset, expert, !image, !saveCorr); + offsRw+fSSDRawsOffset, expert, !image, !saveCorr); fSSDRawsOffset += 1; fSSDRawsDAOffset += 1; }//online flag fSSDhRawsTask = fSSDRawsOffset; AliDebug(AliQAv1::GetQADebugLevel(),Form("%d SSD Raws histograms booked\n",fSSDhRawsTask)); - AliDebug(AliQAv1::GetQADebugLevel(), Form("Number of histograms (SPD+SDD+SSD): %d\n",fGenRawsOffset[specie]+fSSDhRawsTask)); - AliDebug(AliQAv1::GetQADebugLevel(),Form("Number of histograms (SPD+SDD+SSD): %d\n",fGenRawsOffset[specie]+fSSDRawsOffset)); + AliDebug(AliQAv1::GetQADebugLevel(), Form("Number of histograms (SPD+SDD+SSD): %d\n",offsRw+fSSDhRawsTask)); + AliDebug(AliQAv1::GetQADebugLevel(),Form("Number of histograms (SPD+SDD+SSD): %d\n",offsRw+fSSDRawsOffset)); /* - fSSDhTask = fSSDRawsOffset; - AliDebug(AliQAv1::GetQADebugLevel(),Form("%d SSD Raws histograms booked\n",fSSDhTask)); - AliDebug(AliQAv1::GetQADebugLevel(), Form("Number of histograms (SPD+SDD+SSD): %d\n",fGenRawsOffset[specie]+fSSDhTask)); - AliDebug(AliQAv1::GetQADebugLevel(),Form("Number of histograms (SPD+SDD+SSD): %d\n",fGenRawsOffset[specie]+fSSDRawsOffset)); - */ + fSSDhTask = fSSDRawsOffset; + AliDebug(AliQAv1::GetQADebugLevel(),Form("%d SSD Raws histograms booked\n",fSSDhTask)); + AliDebug(AliQAv1::GetQADebugLevel(), Form("Number of histograms (SPD+SDD+SSD): %d\n",offsRw+fSSDhTask)); + AliDebug(AliQAv1::GetQADebugLevel(),Form("Number of histograms (SPD+SDD+SSD): %d\n",offsRw+fSSDRawsOffset)); + */ //} //event species loop @@ -840,10 +844,10 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { } //____________________________________________________________________________ -Int_t AliITSQASSDDataMakerRec::MakeRaws(AliRawReader* rawReader) { +Int_t AliITSQASSDDataMakerRec::MakeRaws(AliRawReader* rawReader) +{ // Fill QA for RAW - SSD - Int_t rv = 0 ; - Int_t gStripNumber; Int_t gHistPosition; Int_t gLayer = 0,gLadder = 0, gModule = 0; @@ -853,147 +857,147 @@ Int_t AliITSQASSDDataMakerRec::MakeRaws(AliRawReader* rawReader) { Double_t sumSSDDataSize = 0.0; Double_t eventSize = -1.0; - for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { - if (!AliQAv1::Instance()->IsEventSpecieSet(specie)) continue; - //cout << "MakeRaws: Event specie " << specie << " is set" << endl; - - //AliInfo(Form("fGenRawsOffset[specie] %d\n",fGenRawsOffset[specie])); + // RS: I've commented this loop over species: makes no sense in the event loop + // for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { + // if (!AliQAv1::Instance()->IsEventSpecieSet(specie)) continue; + int specie = fAliITSQADataMakerRec->GetEventSpecie(); + //cout << "MakeRaws: Event specie " << specie << " is set" << endl; + // + int offsRw = fGenRawsOffset[specie]; + // + //AliInfo(Form("offsRw %d\n",offsRw)); + if(fkOnline) { + //reset the signal vs strip number histograms + for(Int_t iModule = 0; iModule < fgkSSDMODULES; iModule++) + fHistSSDRawSignalModule[iModule]->Reset(); + }//online flag + + rawReader->Select("ITSSSD",-1,-1); + rawReader->Reset(); //rawReader->NextEvent(); + //AliInfo(Form("offsRw %d\n",offsRw)); + fAliITSQADataMakerRec->FillRawsData(offsRw,rawReader->GetType()); + + AliITSRawStreamSSD gSSDStream(rawReader); + AliRawReaderRoot *rootReader = (AliRawReaderRoot *)rawReader; + if(rootReader) { + const AliRawEventHeaderBase *header = rootReader->GetEventHeader(); + if(header) + eventSize = header->GetEventSize(); + } + while (gSSDStream.Next()) { + if(gSSDStream.GetModuleID() < 0) continue; + /*cout<<"DDL: "<GetDDLID()<< + " - LDC: "<GetLDCId()<< + " - Size: "<GetDataSize()<< + " - Equipment size: "<GetEquipmentSize()<GetDDLID(); + if(ddlid<0){ + AliError("GetDDLID returns a negative value"); + continue; + } + gSizePerDDL[ddlid] = rawReader->GetDataSize(); + //gSizePerLDC[rawReader->GetLDCId()-8] = rawReader->GetDataSize(); + AliITSgeomTGeo::GetModuleId(gSSDStream.GetModuleID(),gLayer,gLadder,gModule); + gHistPosition = (gLayer == 5) ? ((gLadder - 1)*fgkSSDMODULESPERLADDERLAYER5 + gModule - 1) : ((gLadder - 1)*fgkSSDMODULESPERLADDERLAYER6 + gModule + fgkSSDMODULESLAYER5 - 1); if(fkOnline) { - //reset the signal vs strip number histograms - for(Int_t iModule = 0; iModule < fgkSSDMODULES; iModule++) - fHistSSDRawSignalModule[iModule]->Reset(); + if(gSSDStream.GetStrip() < 0) { + //Printf("Layer: %d - Ladder: %d - Module: %d - Strip: %d - Signal: %lf",gLayer,gLadder,gModule,gSSDStream.GetStrip(),gSSDStream.GetSignal()); + if(TMath::Abs(gSSDStream.GetStrip()) < 7) + fHistSSDCMModule[gHistPosition]->Fill(gSSDStream.GetSignal()); + if(TMath::Abs(gSSDStream.GetStrip()) > 6) + fHistSSDCMModule[fgkSSDMODULES+gHistPosition]->Fill(gSSDStream.GetSignal()); + }//CM values + else { + gStripNumber = (gSSDStream.GetSideFlag() == 0) ? gSSDStream.GetStrip() : -gSSDStream.GetStrip() + 2*fgkNumberOfPSideStrips; + //AliDebug(AliQAv1::GetQADebugLevel(), Form("ModulePosition: %d - Layer: %d - Ladder: %d - Module: %d\n",gHistPosition,gLayer,gLadder,gModule)); + fHistSSDRawSignalModule[gHistPosition]->Fill(gStripNumber,gSSDStream.GetSignal()); + //fAliITSQADataMakerRec->FillRawsData(offsRw+gHistPosition+fSSDRawsCommonLevelOffset,gStripNumber,gSSDStream.GetSignal()); + }//normal strip signal }//online flag - - rawReader->Select("ITSSSD",-1,-1); - rawReader->Reset(); //rawReader->NextEvent(); - //AliInfo(Form("fGenRawsOffset[specie] %d\n",fGenRawsOffset[specie])); - (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]))->Fill(rawReader->GetType()); - - if(rawReader->GetType() == 7) { - fSSDEvent += 1; - fSSDEventPerCycle += 1; - } - - AliITSRawStreamSSD gSSDStream(rawReader); - AliRawReaderRoot *rootReader = (AliRawReaderRoot *)rawReader; - if(rootReader) { - const AliRawEventHeaderBase *header = rootReader->GetEventHeader(); - if(header) - eventSize = header->GetEventSize(); - } - while (gSSDStream.Next()) { - if(gSSDStream.GetModuleID() < 0) continue; - /*cout<<"DDL: "<GetDDLID()<< - " - LDC: "<GetLDCId()<< - " - Size: "<GetDataSize()<< - " - Equipment size: "<GetEquipmentSize()<GetDDLID()] = rawReader->GetDataSize(); - gSizePerLDC[rawReader->GetLDCId()-8] = rawReader->GetDataSize(); - AliITSgeomTGeo::GetModuleId(gSSDStream.GetModuleID(),gLayer,gLadder,gModule); - gHistPosition = (gLayer == 5) ? ((gLadder - 1)*fgkSSDMODULESPERLADDERLAYER5 + gModule - 1) : ((gLadder - 1)*fgkSSDMODULESPERLADDERLAYER6 + gModule + fgkSSDMODULESLAYER5 - 1); - if(fkOnline) { - if(gSSDStream.GetStrip() < 0) { - //Printf("Layer: %d - Ladder: %d - Module: %d - Strip: %d - Signal: %lf",gLayer,gLadder,gModule,gSSDStream.GetStrip(),gSSDStream.GetSignal()); - if(TMath::Abs(gSSDStream.GetStrip()) < 7) - fHistSSDCMModule[gHistPosition]->Fill(gSSDStream.GetSignal()); - if(TMath::Abs(gSSDStream.GetStrip()) > 6) - fHistSSDCMModule[fgkSSDMODULES+gHistPosition]->Fill(gSSDStream.GetSignal()); - }//CM values - else { - gStripNumber = (gSSDStream.GetSideFlag() == 0) ? gSSDStream.GetStrip() : -gSSDStream.GetStrip() + 2*fgkNumberOfPSideStrips; - //AliDebug(AliQAv1::GetQADebugLevel(), Form("ModulePosition: %d - Layer: %d - Ladder: %d - Module: %d\n",gHistPosition,gLayer,gLadder,gModule)); - fHistSSDRawSignalModule[gHistPosition]->Fill(gStripNumber,gSSDStream.GetSignal()); - //fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+gHistPosition+fSSDRawsCommonLevelOffset)->Fill(gStripNumber,gSSDStream.GetSignal()); - }//normal strip signal - }//online flag - }//streamer loop - - //event size calculation and filling info - for(Int_t i = 0; i < fgkNumOfDDLs; i++) { - sumSSDDataSize += gSizePerDDL[i]; - if(gSizePerDDL[i] > 0) { - (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+3))->Fill(i+512); - (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+5+i))->Fill(gSizePerDDL[i]/1e+03); - - - //if(i == 5) - //cout<GetRawsData(fGenRawsOffset[specie]+4))->Fill(i+512,gSizePerDDL[i]/1e+06); - } - for(Int_t i = 0; i < fgkNumOfLDCs; i++) { - if(gSizePerLDC[i] > 0) { - (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+21))->Fill(i+170); - //LDC 170 - if(i == 0) - gSizePerLDC[i] = gSizePerDDL[8] + gSizePerDDL[9]; - //LDC 171 - if(i == 1) - gSizePerLDC[i] = gSizePerDDL[10] + gSizePerDDL[11]; - //LDC 172 - if(i == 2) - gSizePerLDC[i] = gSizePerDDL[12] + gSizePerDDL[13]; - //LDC 173 - if(i == 3) - gSizePerLDC[i] = gSizePerDDL[14] + gSizePerDDL[15]; - //LDC 174 - if(i == 4) - gSizePerLDC[i] = gSizePerDDL[0] + gSizePerDDL[1]; - //LDC 175 - if(i == 5) - gSizePerLDC[i] = gSizePerDDL[2] + gSizePerDDL[3]; - //LDC 176 - if(i == 6) - gSizePerLDC[i] = gSizePerDDL[4] + gSizePerDDL[5]; - //LDC 177 - if(i == 7) - gSizePerLDC[i] = gSizePerDDL[6] + gSizePerDDL[7]; - - (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+23+i))->Fill(gSizePerLDC[i]/1e+03); - //cout<<"Event: "<GetRawsData(fGenRawsOffset[specie]+22))->Fill(i+6,gSizePerLDC[i]/1e+06); + }//streamer loop + + //event size calculation and filling info + for(Int_t i = 0; i < fgkNumOfDDLs; i++) { + sumSSDDataSize += gSizePerDDL[i]; + if(gSizePerDDL[i] > 0) { + fAliITSQADataMakerRec->FillRawsData(offsRw+3,i+512); + fAliITSQADataMakerRec->FillRawsData(offsRw+5+i,gSizePerDDL[i]/1e+03); + //if(i == 5) + //cout<FillRawsData(offsRw+4),i+512,gSizePerDDL[i]/1e+06); + } + for(Int_t i = 0; i < fgkNumOfLDCs; i++) { + //LDC 170 + if(i == 0) + gSizePerLDC[i] = gSizePerDDL[8] + gSizePerDDL[9]; + //LDC 171 + if(i == 1) + gSizePerLDC[i] = gSizePerDDL[10] + gSizePerDDL[11]; + //LDC 172 + if(i == 2) + gSizePerLDC[i] = gSizePerDDL[12] + gSizePerDDL[13]; + //LDC 173 + if(i == 3) + gSizePerLDC[i] = gSizePerDDL[14] + gSizePerDDL[15]; + //LDC 174 + if(i == 4) + gSizePerLDC[i] = gSizePerDDL[0] + gSizePerDDL[1]; + //LDC 175 + if(i == 5) + gSizePerLDC[i] = gSizePerDDL[2] + gSizePerDDL[3]; + //LDC 176 + if(i == 6) + gSizePerLDC[i] = gSizePerDDL[4] + gSizePerDDL[5]; + //LDC 177 + if(i == 7) + gSizePerLDC[i] = gSizePerDDL[6] + gSizePerDDL[7]; - // for(Int_t i = 0; i < fgkNumOfDDLs; i++) { - // Double_t gSizePerDDL = ((TH1D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+5+i))->GetMean(); - //if(i == 5) - //cout<<"DDL: "<GetRawsData(fGenRawsOffset[specie]+5+i))->GetMean()<GetRawsData(fGenRawsOffset[specie]+1))->Fill(sumSSDDataSize/1e+03); - if(eventSize) - (fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+2))->Fill(100.*sumSSDDataSize/eventSize); - - //Occupancy calculation - if(fkOnline) { - for(Int_t iModule = 0; iModule < fgkSSDMODULES; iModule++) { - GetOccupancyStrip(fHistSSDRawSignalModule[iModule],fOccupancyMatrix[iModule]); - //if(iModule == 156) { - //cout<<"========================================"<GetXaxis()->GetNbins(); iBin++) { - if((iBin >= 750)&&(iBin <= 780)) - cout<<"Event: "<GetBinContent(iBin)< to be removed - //}//module cut --> to be removed - }//module loop - }//online flag for SSD - - //cout<<"Event type entries: "<<((TH1*)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]))->GetEntries()<GetRawsData(fGenRawsOffset[specie]+3))->GetEntries()<< endl; - //cout<<"LDC id entries at MR: "<<((TH1D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+21))->GetEntries()<< endl; + if(gSizePerLDC[i] > 0) fAliITSQADataMakerRec->FillRawsData(offsRw+21,i+170); + fAliITSQADataMakerRec->FillRawsData(offsRw+23+i,gSizePerLDC[i]/1e+03); + //cout<<"Event: "<FillRawsData(offsRw+22),i+6,gSizePerLDC[i]/1e+06); + } + + // RS Invalid + // for(Int_t i = 0; i < fgkNumOfDDLs; i++) { + // Double_t gSizePerDDL = ((TH1F *)fAliITSQADataMakerRec->GetRawsData(offsRw+5+i))->GetMean(); + //if(i == 5) + //cout<<"DDL: "<GetRawsData(offsRw+5+i))->GetMean()<FillRawsData(offsRw+1,sumSSDDataSize/1e+03); + if(eventSize) fAliITSQADataMakerRec->FillRawsData(offsRw+2,100.*sumSSDDataSize/eventSize); + + //Occupancy calculation + if(fkOnline) { + for(Int_t iModule = 0; iModule < fgkSSDMODULES; iModule++) { + GetOccupancyStrip(fHistSSDRawSignalModule[iModule],fOccupancyMatrix[iModule]); + //if(iModule == 156) { + //cout<<"========================================"<GetXaxis()->GetNbins(); iBin++) { + if((iBin >= 750)&&(iBin <= 780)) + cout<<"Event: "<GetBinContent(iBin)< to be removed + //}//module cut --> to be removed + }//module loop + }//online flag for SSD + // RS Invalid + //cout<<"Event type entries: "<<((TH1*)fAliITSQADataMakerRec->GetRawsData(offsRw))->GetEntries()<GetRawsData(offsRw+3))->GetEntries()<< endl; + //cout<<"LDC id entries at MR: "<<((TH1F *)fAliITSQADataMakerRec->GetRawsData(offsRw+21))->GetEntries()<< endl; + + // } //event species loop // commented by RS + // return rv ; } @@ -1056,49 +1060,55 @@ Double_t AliITSQASSDDataMakerRec::GetOccupancyModule(TH1 *lHisto, else if(mode == 2) lOccupancy = 100.*sumOccupancy/fgkNumberOfPSideStrips; - /* if(histname.Contains("Layer5_Ladder507_Module3")) - cout<<"Fired strips: "<GetNbinsX(),lOccupancy)); return lOccupancy; } //____________________________________________________________________________ - void AliITSQASSDDataMakerRec::MonitorCMValues() { +void AliITSQASSDDataMakerRec::MonitorCMValues(Int_t trCl) +{ //Monitor in AMORE the CM values - //for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { - //if (!AliQAv1::Instance()->IsEventSpecieSet(specie)) continue; - //cout << "MonitorCMValues: Event specie " << specie << " is set" << endl; - Int_t specie = fAliITSQADataMakerRec->GetEventSpecie(); - fAliITSQADataMakerRec->SetEventSpecie(AliRecoParam::ConvertIndex(specie)); + //for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { + //if (!AliQAv1::Instance()->IsEventSpecieSet(specie)) continue; + //cout << "MonitorCMValues: Event specie " << specie << " is set" << endl; + Int_t specie = fAliITSQADataMakerRec->GetEventSpecie(); + int offsRw = fGenRawsOffset[specie]; - //compute the rms of the CM values - Int_t gLayer = 0, gLadder = 0, gModule = 0; - Double_t rmsPsideCM = 0.0, rmsNsideCM = 0.0; - for(Int_t i = 0; i < fgkSSDMODULES; i++) { - rmsPsideCM = 0.0; rmsNsideCM = 0.0; - AliITSgeomTGeo::GetModuleId(i+500,gLayer,gLadder,gModule); - //Printf("%s - %s",((TH1*)list->At(i))->GetName(), - //((TH1*)list->At(1698+i))->GetName()); - rmsPsideCM = fHistSSDCMModule[i]->GetRMS(); - rmsNsideCM = fHistSSDCMModule[fgkSSDMODULES+i]->GetRMS(); - //Printf("rmsPside: %lf - rmsNside: %lf",rmsPsideCM,rmsNsideCM); - if(gLayer == 5) { - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+4))->SetBinContent(gModule,gLadder,rmsPsideCM); - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+5))->SetBinContent(gModule,gLadder,rmsNsideCM); - } - if(gLayer == 6) { - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+6))->SetBinContent(gModule,gLadder,rmsPsideCM); - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+7))->SetBinContent(gModule,gLadder,rmsNsideCM); - } - }//module loop + //compute the rms of the CM values + Int_t gLayer = 0, gLadder = 0, gModule = 0; + Double_t rmsPsideCM = 0.0, rmsNsideCM = 0.0; + for(Int_t i = 0; i < fgkSSDMODULES; i++) { + rmsPsideCM = 0.0; rmsNsideCM = 0.0; + AliITSgeomTGeo::GetModuleId(i+500,gLayer,gLadder,gModule); + //Printf("%s - %s",((TH1*)list->At(i))->GetName(), + //((TH1*)list->At(1698+i))->GetName()); + rmsPsideCM = fHistSSDCMModule[i]->GetRMS(); + rmsNsideCM = fHistSSDCMModule[fgkSSDMODULES+i]->GetRMS(); + //Printf("rmsPside: %lf - rmsNside: %lf",rmsPsideCM,rmsNsideCM); + if(gLayer == 5) { + TH2* h4 = (TH2*)fAliITSQADataMakerRec->GetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset+4,trCl); + if (h4) h4->SetBinContent(gModule,gLadder,rmsPsideCM); + TH2* h5 = (TH2*)fAliITSQADataMakerRec->GetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset+5,trCl); + if (h5) h5->SetBinContent(gModule,gLadder,rmsNsideCM); + } + if(gLayer == 6) { + TH2* h6 = (TH2*)fAliITSQADataMakerRec->GetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset+6,trCl); + if (h6) h6->SetBinContent(gModule,gLadder,rmsPsideCM); + TH2* h7 = (TH2*)fAliITSQADataMakerRec->GetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset+7,trCl); + if (h7) h7->SetBinContent(gModule,gLadder,rmsNsideCM); + } + }//module loopcdcd //}//event species loop - } +} //____________________________________________________________________________ -void AliITSQASSDDataMakerRec::MonitorOCDBObjects() { +void AliITSQASSDDataMakerRec::MonitorOCDBObjects(Int_t trCl) +{ //Monitor in AMORE the output of the DA //Currently only the bad channel list is monitored //Todo: Noise - Pedestal @@ -1108,17 +1118,18 @@ void AliITSQASSDDataMakerRec::MonitorOCDBObjects() { //if (!AliQAv1::Instance()->IsEventSpecieSet(specie)) continue; //cout << "MonitorOCDBObjects: Event specie " << specie << " is set" << endl; Int_t specie = fAliITSQADataMakerRec->GetEventSpecie(); + int offsRw = fGenRawsOffset[specie]; fAliITSQADataMakerRec->SetEventSpecie(AliRecoParam::ConvertIndex(specie)); - //((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset))->Reset(); - //((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+1))->Reset(); - //((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+2))->Reset(); - //((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+3))->Reset(); + //((TH2F *)fAliITSQADataMakerRec->ResetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset)); + //((TH2F *)fAliITSQADataMakerRec->ResetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset+1)); + //((TH2F *)fAliITSQADataMakerRec->ResetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset+2)); + //((TH2F *)fAliITSQADataMakerRec->ResetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset+3)); AliCDBEntry *entryBadChannelsSSD = fCDBManager->Get("ITS/Calib/BadChannelsSSD"); - if(!entryBadChannelsSSD) - AliError("OCDB entry for the bad channel list is not valid!"); - AliITSBadChannelsSSDv2 *badchannelsSSD = (AliITSBadChannelsSSDv2 *)entryBadChannelsSSD->GetObject(); + if(!entryBadChannelsSSD)AliError("OCDB entry for the bad channel list is not valid!"); + AliITSBadChannelsSSDv2 *badchannelsSSD = NULL; + if(entryBadChannelsSSD)badchannelsSSD = (AliITSBadChannelsSSDv2 *)entryBadChannelsSSD->GetObject(); if(!badchannelsSSD) AliError("Bad channel list object is not a valid AliITSBadChannelsSSD object!"); @@ -1136,25 +1147,26 @@ void AliITSQASSDDataMakerRec::MonitorOCDBObjects() { nPSideChannelsLayer6 = 0, nNSideChannelsLayer6 = 0; Int_t badChannel = 0; - for(Int_t j = 0; j < fgkNumberOfPSideStrips; j++) { - badChannel = (Int_t)(badchannelsSSD->GetBadChannelP(i,j)); - if(badChannel != 0) { - if(layer == 5) - nPSideChannelsLayer5 += 1; - if(layer == 6) - nPSideChannelsLayer6 += 1; - nBadPSideChannels += 1; - }//badchannel flag != 0 - badChannel = (Int_t)(badchannelsSSD->GetBadChannelN(i,j)); - if(badChannel != 0) { - if(layer == 5) - nNSideChannelsLayer5 += 1; - if(layer == 6) - nNSideChannelsLayer6 += 1; -nBadNSideChannels += 1; - }//badchannel flag != 0 - }//loop over strips - + if(badchannelsSSD){ + for(Int_t j = 0; j < fgkNumberOfPSideStrips; j++) { + badChannel = (Int_t)(badchannelsSSD->GetBadChannelP(i,j)); + if(badChannel != 0) { + if(layer == 5) + nPSideChannelsLayer5 += 1; + if(layer == 6) + nPSideChannelsLayer6 += 1; + nBadPSideChannels += 1; + }//badchannel flag != 0 + badChannel = (Int_t)(badchannelsSSD->GetBadChannelN(i,j)); + if(badChannel != 0) { + if(layer == 5) + nNSideChannelsLayer5 += 1; + if(layer == 6) + nNSideChannelsLayer6 += 1; + nBadNSideChannels += 1; + }//badchannel flag != 0 + }//loop over strips + } //cout << "Bad channels P side module " << module << ": " << nBadPSideChannels << endl; //cout << "Bad channels N side module " << module << ": " << nBadNSideChannels << endl; @@ -1163,24 +1175,32 @@ nBadNSideChannels += 1; /*if((module == 10)&&(ladder == 10)) { cout<<"Npside bad: "< 0) - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset))->SetBinContent(module,ladder,100.*nPSideChannelsLayer5/fgkNumberOfPSideStrips); - else ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset))->SetBinContent(module,ladder,0.0001); - if(nNSideChannelsLayer5 > 0) - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+1))->SetBinContent(module,ladder,100.*nNSideChannelsLayer5/fgkNumberOfPSideStrips); - else ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+1))->SetBinContent(module,ladder,0.0001); + TH2* h0 = (TH2*)fAliITSQADataMakerRec->GetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset,trCl); + if (h0) { + if(nPSideChannelsLayer5 > 0) h0->SetBinContent(module,ladder,100.*nPSideChannelsLayer5/fgkNumberOfPSideStrips); + else h0->SetBinContent(module,ladder,0.0001); + } + TH2* h1 = (TH2*)fAliITSQADataMakerRec->GetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset+1,trCl); + if (h1) { + if(nNSideChannelsLayer5 > 0) h1->SetBinContent(module,ladder,100.*nNSideChannelsLayer5/fgkNumberOfPSideStrips); + else h1->SetBinContent(module,ladder,0.0001); + } }//layer 5 if(layer == 6) { - if(nPSideChannelsLayer6 > 0) - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+2))->SetBinContent(module,ladder,100.*nPSideChannelsLayer6/fgkNumberOfPSideStrips); - else ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+2))->SetBinContent(module,ladder,0.0001); - if(nNSideChannelsLayer6 > 0) - ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+3))->SetBinContent(module,ladder,100.*nNSideChannelsLayer6/fgkNumberOfPSideStrips); - else ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+3))->SetBinContent(module,ladder,0.0001); + TH2* h2 = (TH2*)fAliITSQADataMakerRec->GetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset+2,trCl); + if (h2) { + if(nPSideChannelsLayer6 > 0) h2->SetBinContent(module,ladder,100.*nPSideChannelsLayer6/fgkNumberOfPSideStrips); + else h2->SetBinContent(module,ladder,0.0001); + } + TH2* h3 = (TH2*)fAliITSQADataMakerRec->GetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset+3,trCl); + if (h3) { + if(nNSideChannelsLayer6 > 0) h3->SetBinContent(module,ladder,100.*nNSideChannelsLayer6/fgkNumberOfPSideStrips); + else h3->SetBinContent(module,ladder,0.0001); + } }//layer 6 }//module loop - - //cout << "entries bad channel layer 5 n side " << ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset+1))->GetEntries() << " - Bad channels P side layer 5 module 10 ladder 10: " << ((TH2D *)fAliITSQADataMakerRec->GetRawsData(fGenRawsOffset[specie]+fSSDRawsOffset-fSSDRawsDAOffset))->GetBinContent(10,10)<GetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset+1))->GetEntries() << " - Bad channels P side layer 5 module 10 ladder 10: " << ((TH2F *)fAliITSQADataMakerRec->GetRawsData(offsRw+fSSDRawsOffset-fSSDRawsDAOffset))->GetBinContent(10,10)<fDigitsQAList[AliRecoParam::kDefault])->GetEntries(); + // fGenDigitsOffset = (fAliITSQADataMakerRec->fDigitsQAList[AliRecoParam::kDefault])->GetEntries(); // custom code here TH1F *fHistSSDModule = new TH1F("fHistSSDDigitsModule", ";SSD Module Number;N_{DIGITS}", 1698,499.5,2197.5); - rv = fAliITSQADataMakerRec->Add2DigitsList(fHistSSDModule, - fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 0, !expert, image); + rv = fAliITSQADataMakerRec->Add2DigitsList(fHistSSDModule, + fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 0, !expert, image); fSSDhDigitsTask += 1; TH2F *fHistSSDModuleStrip = new TH2F("fHistSSDDigitsModuleStrip", ";N_{Strip};N_{Module}", 1540,0,1540,1698,499.5,2197.5); rv = fAliITSQADataMakerRec->Add2DigitsList(fHistSSDModuleStrip, - fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 1, !expert, image); + fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 1, !expert, image); fSSDhDigitsTask += 1; AliDebug(AliQAv1::GetQADebugLevel(),Form("%d SSD Digits histograms booked\n",fSSDhDigitsTask)); @@ -1215,11 +1235,13 @@ Int_t AliITSQASSDDataMakerRec::InitDigits() { } //____________________________________________________________________________ -Int_t AliITSQASSDDataMakerRec::MakeDigits(TTree *digits) { +Int_t AliITSQASSDDataMakerRec::MakeDigits(TTree *digits) +{ // Fill QA for DIGIT - SSD - -// AliITS *fITS = (AliITS*)gAlice->GetModule("ITS"); -// fITS->SetTreeAddress(); -// TClonesArray *iSSDdigits = fITS->DigitsAddress(2); + // AliITS *fITS = (AliITS*)gAlice->GetModule("ITS"); + // fITS->SetTreeAddress(); + // TClonesArray *iSSDdigits = fITS->DigitsAddress(2); + // Int_t rv = 0 ; TBranch *branchD = digits->GetBranch("ITSDigitsSSD"); if (!branchD) { @@ -1235,16 +1257,17 @@ Int_t AliITSQASSDDataMakerRec::MakeDigits(TTree *digits) { digits->GetEvent(iModule); Int_t ndigits = iSSDdigits->GetEntries(); //printf("Module = %i \t ndigits = %i\t offset = %i \n",iModule,ndigits,fAliITSQADataMakerRec->GetEventSpecie() ); - fAliITSQADataMakerRec->GetDigitsData(fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 0)->Fill(iModule,ndigits); + fAliITSQADataMakerRec->FillDigitsData(fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 0,iModule,ndigits); if(ndigits != 0) AliDebug(AliQAv1::GetQADebugLevel(),Form("Module: %d - Digits: %d",iModule,ndigits)); for (Int_t iDigit = 0; iDigit < ndigits; iDigit++) { AliITSdigit *dig = (AliITSdigit*)iSSDdigits->UncheckedAt(iDigit); Int_t fStripNumber = (dig->GetCoord1() == 0) ? dig->GetCoord2() : dig->GetCoord2() + fgkNumberOfPSideStrips; - ((TH2F *)fAliITSQADataMakerRec->GetDigitsData(fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 1))->Fill(fStripNumber,iModule,dig->GetSignal()); + fAliITSQADataMakerRec->FillDigitsData(fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 1,fStripNumber,iModule,dig->GetSignal()); }//digit loop }//module loop + // return rv ; } @@ -1257,7 +1280,7 @@ Int_t AliITSQASSDDataMakerRec::InitRecPoints() Int_t rv = 0 ; //AliInfo(Form("fAliITSQADataMakerRec->GetEventSpecie() %d\n",fAliITSQADataMakerRec->GetEventSpecie())); //AliInfo(Form("fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] %d\n",fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])); -// fGenRecPointsOffset = (fAliITSQADataMakerRec->fRecPointsQAList[AliRecoParam::kDefault])->GetEntries(); + // fGenRecPointsOffset = (fAliITSQADataMakerRec->fRecPointsQAList[AliRecoParam::kDefault])->GetEntries(); //AliDebug(AliQAv1::GetQADebugLevel(), Form("**-------*-*-*-*-*-*-***************AliITSQASSDataMakerRec::MakeRecpoints offset %d \t %d \n",fGenOffset,fGenRecPointsOffset)); Int_t nModuleOffset = 500; Int_t nITSTotalModules = AliITSgeomTGeo::GetNModules(); @@ -1268,7 +1291,7 @@ Int_t AliITSQASSDDataMakerRec::InitRecPoints() nModuleOffset - 0.5, nITSTotalModules-fgkSSDMODULESLAYER6+0.5); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDModuleIdLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 0, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 0, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDModuleIdLayer6 = new TH1F("fHistSSDModuleIdLayer6", "Module Id - Layer 6;Module Id;Entries", @@ -1276,201 +1299,201 @@ Int_t AliITSQASSDDataMakerRec::InitRecPoints() nModuleOffset+fgkSSDMODULESLAYER5 - 0.5, nITSTotalModules + 0.5); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDModuleIdLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 1, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 1, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDClusterPerEventLayer5 = new TH1F("fHistSSDClusterPerEventLayer5", "N_{clusters} - Layer 5;N_{clusters};Entries;", 100,0.1,5000); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterPerEventLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 2, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 2, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDClusterPerEventLayer6 = new TH1F("fHistSSDClusterPerEventLayer6", "N_{clusters} - Layer 6;N_{clusters};Entries;", 100,0.1,5000); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterPerEventLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 3, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 3, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDLocalXLayer5 = new TH1F("fHistSSDLocalXLayer5", "Local x coord.- Layer 5;x [cm];Entries;", 100,-4.,4.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDLocalXLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 4, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 4, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDLocalXLayer6 = new TH1F("fHistSSDLocalXLayer6", "Local x coord.- Layer 6;x [cm];Entries;", 100,-4.,4.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDLocalXLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 5, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 5, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDLocalZLayer5 = new TH1F("fHistSSDLocalZLayer5", "Local z coord.- Layer 5;z [cm];Entries;", 100,-4.,4.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDLocalZLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 6, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 6, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDLocalZLayer6 = new TH1F("fHistSSDLocalZLayer6", "Local z coord.- Layer 6;z [cm];Entries;", 100,-4.,4.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDLocalZLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 7, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 7, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDGlobalXLayer5 = new TH1F("fHistSSDGlobalXLayer5", "Global x - Layer 5;x [cm];Entries;", 100,-40.,40.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalXLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 8, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 8, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDGlobalXLayer6 = new TH1F("fHistSSDGlobalXLayer6", "Global x - Layer 6;x [cm];Entries;", 100,-45.,45.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalXLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 9, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 9, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDGlobalYLayer5 = new TH1F("fHistSSDGlobalYLayer5", "Global y - Layer 5;y [cm];Entries;", 100,-40.,40); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalYLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 10, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 10, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDGlobalYLayer6 = new TH1F("fHistSSDGlobalYLayer6", "Global y - Layer 6;y [cm];Entries;", 100,-45.,45.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalYLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 11, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 11, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDGlobalZLayer5 = new TH1F("fHistSSDGlobalZLayer5", "Global z - Layer 5;z [cm];Entries;", 100,-45.,45); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalZLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 12, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 12, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDGlobalZLayer6 = new TH1F("fHistSSDGlobalZLayer6", "Global z - Layer 6;z [cm];Entries;", 100,-55.,55.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDGlobalZLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 13, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 13, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDPhiLayer5 = new TH1F("fHistSSDPhiLayer5", "#phi - Layer 5;#phi [rad];Entries;", 100,-TMath::Pi(),TMath::Pi()); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDPhiLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 14, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 14, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDPhiLayer6 = new TH1F("fHistSSDPhiLayer6", "#phi - Layer 6;#phi [rad];Entries;", 100,-TMath::Pi(),TMath::Pi()); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDPhiLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 15, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 15, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDThetaLayer5 = new TH1F("fHistSSDThetaLayer5", "#theta - Layer 5;#theta [rad];Entries;", 100,-TMath::Pi(),TMath::Pi()); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDThetaLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 16, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 16, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDThetaLayer6 = new TH1F("fHistSSDThetaLayer6", "#theta - Layer 6;#theta [rad];Entries;", 100,-TMath::Pi(),TMath::Pi()); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDThetaLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 17, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 17, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDRadiusLayer5 = new TH1F("fHistSSDRadiusLayer5", "r - Layer 5;r [cm];Entries;", 100,35.,50.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDRadiusLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 18, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 18, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDRadiusLayer6 = new TH1F("fHistSSDRadiusLayer6", "r - Layer 6;r [cm];Entries;", 100,35.,50.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDRadiusLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 19, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 19, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDClusterTypeLayer5 = new TH1F("fHistSSDClusterTypeLayer5", "CL type - Layer 5;Cluster type;Entries;", 150,0,150); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterTypeLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 20, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 20, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDClusterTypeLayer6 = new TH1F("fHistSSDClusterTypeLayer6", "CL type - Layer 6;Cluster type;Entries;", 150,0,150); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterTypeLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 21, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 21, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDChargeRatioLayer5 = new TH1F("fHistSSDChargeRatioLayer5", "Charge ratio - Layer 5;q_{ratio};Entries;", 100,-2.0,2.0); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeRatioLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 22, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 22, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDChargeRatioLayer6 = new TH1F("fHistSSDChargeRatioLayer6", "Charge ratio - Layer 6;q_{ratio};Entries;", 100,-2.0,2.0); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeRatioLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 23, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 23, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDChargekeVLayer5 = new TH1F("fHistSSDChargekeVLayer5", "Charge - Layer 5;q [keV];Entries;", 100,0.,300.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargekeVLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 24, !expert, image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 24, !expert, image); fSSDhRecPointsTask += 1; TH1F *fHistSSDChargekeVLayer6 = new TH1F("fHistSSDChargekeVLayer6", "Charge - Layer 6;q [keV];Entries;", 100,0.,300.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargekeVLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 25, !expert, image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 25, !expert, image); fSSDhRecPointsTask += 1; TH1F *fHistSSDChargePSideLayer5 = new TH1F("fHistSSDChargePSideLayer5", "Charge P- Layer 5;q_{P} [keV];Entries;", 100,0.,300.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargePSideLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 26, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 26, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDChargePSideLayer6 = new TH1F("fHistSSDChargePSideLayer6", "Charge P- Layer 6;q_{P} [keV];Entries;", 100,0.,300.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargePSideLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 27, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 27, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDChargeNSideLayer5 = new TH1F("fHistSSDChargeNSideLayer5", "Charge N- Layer 5;q_{N} [keV];Entries;", 100,0.,300.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeNSideLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 28, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 28, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDChargeNSideLayer6 = new TH1F("fHistSSDChargeNSideLayer6", "Charge N- Layer 6;q_{N} [keV];Entries;", 100,0.,300.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeNSideLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 29, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 29, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDChargeRatio2Layer5 = new TH1F("fHistSSDChargeRatio2Layer5", "Charge Ratio qN/qP - Layer 5;q_{N}/q_{P};Entries;", 100,0,2); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeRatio2Layer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 30, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 30, expert, !image); fSSDhRecPointsTask += 1; TH1F *fHistSSDChargeRatio2Layer6 = new TH1F("fHistSSDChargeRatio2Layer6", "Charge Ratio qN/qP - Layer 6;q_{N}/q_{P};Entries;", 100,0,2); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeRatio2Layer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 31, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 31, expert, !image); fSSDhRecPointsTask += 1; TH2F *fHistSSDChargePNSideLayer5 = new TH2F("fHistSSDChargePNSideLayer5", "Charge correlation - Layer 5;q_{P} [keV];q_{N} [keV]", 100,0.,300., 100,0.,300.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargePNSideLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 32, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 32, expert, !image); fSSDhRecPointsTask += 1; TH2F *fHistSSDChargePNSideLayer6 = new TH2F("fHistSSDChargePNSideLayer6", "Charge correlation - Layer 6;q_{P} [keV];q_{N} [keV]", 100,0.,300., 100,0.,300.); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargePNSideLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 33, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 33, expert, !image); fSSDhRecPointsTask += 1; TH2F *fHistSSDChargeMapLayer5 = new TH2F("fHistSSDChargeMapLayer5", "Charge map;N_{modules};N_{Ladders}", @@ -1479,7 +1502,7 @@ Int_t AliITSQASSDDataMakerRec::InitRecPoints() 3*fgkSSDLADDERSLAYER5, -0.5,fgkSSDLADDERSLAYER5+0.5); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeMapLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 34, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 34, expert, !image); fSSDhRecPointsTask += 1; TH2F *fHistSSDChargeMapLayer6 = new TH2F("fHistSSDChargeMapLayer6", "Charge map;N_{modules};N_{Ladders}", @@ -1488,7 +1511,7 @@ Int_t AliITSQASSDDataMakerRec::InitRecPoints() 3*fgkSSDLADDERSLAYER6, -0.5,fgkSSDLADDERSLAYER6+0.5); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDChargeMapLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 35, expert, !image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 35, expert, !image); fSSDhRecPointsTask += 1; TH2F *fHistSSDClusterMapLayer5 = new TH2F("fHistSSDClusterMapLayer5", "Layer 5;N_{module};N_{ladder}", @@ -1504,7 +1527,7 @@ Int_t AliITSQASSDDataMakerRec::InitRecPoints() fHistSSDClusterMapLayer5->GetZaxis()->SetTitleOffset(1.4); fHistSSDClusterMapLayer5->GetZaxis()->SetTitle("N_{clusters}"); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterMapLayer5, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 36, !expert, image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 36, !expert, image); fSSDhRecPointsTask += 1; TH2F *fHistSSDClusterMapLayer6 = new TH2F("fHistSSDClusterMapLayer6", "Layer 6;N_{module};N_{ladder}", @@ -1520,7 +1543,7 @@ Int_t AliITSQASSDDataMakerRec::InitRecPoints() fHistSSDClusterMapLayer6->GetZaxis()->SetTitleOffset(1.4); fHistSSDClusterMapLayer6->GetZaxis()->SetTitle("N_{clusters}"); rv = fAliITSQADataMakerRec->Add2RecPointsList(fHistSSDClusterMapLayer6, - fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 37, !expert, image); + fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 37, !expert, image); fSSDhRecPointsTask += 1; //printf ("%d SSD Recs histograms booked\n",fSSDhRecPointsTask); AliDebug(AliQAv1::GetQADebugLevel(),Form("%d SSD Recs histograms booked\n",fSSDhRecPointsTask)); @@ -1532,26 +1555,30 @@ Int_t AliITSQASSDDataMakerRec::MakeRecPoints(TTree *clustersTree) { // Fill QA for recpoints - SSD - //printf("*-*-*-*-*-*-*---*-*-*-------*-*-*-*-*-*-***************AliITSQASSDataMakerRec::MakeRecpoints called \n"); + // Int_t rv = 0 ; Int_t gLayer = 0, gLadder = 0, gModule = 0; Int_t lLadderLocationY = 0; - TBranch *branchRecP = clustersTree->GetBranch("ITSRecPoints"); - if (!branchRecP) { - AliError("can't get the branch with the ITS clusters !"); + TClonesArray *recpoints = NULL; + AliITSRecPointContainer* rpcont=AliITSRecPointContainer::Instance(); + rpcont->FetchClusters(0,clustersTree); + if(!rpcont->GetStatusOK() || !rpcont->IsSSDActive()){ + AliError("can't get SSD clusters !"); return rv; } //AliInfo(Form("fAliITSQADataMakerRec->GetEventSpecie() %d\n",fAliITSQADataMakerRec->GetEventSpecie())); //AliInfo(Form("fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] %d\n",fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()])); - static TClonesArray statRecpoints("AliITSRecPoint"); - TClonesArray *recpoints = &statRecpoints; - branchRecP->SetAddress(&recpoints); Int_t nClustersLayer5 = 0, nClustersLayer6 = 0; Int_t npoints = 0; Float_t cluglo[3]={0.,0.,0.}; //printf("*-*-*-*-*-*-*---*-*-*-------*-*-*-*-*-*-***************AliITSQASSDataMakerRec::MakeRecpoints STEP1 \n"); - for(Int_t module = 0; module < clustersTree->GetEntries(); module++){ - branchRecP->GetEvent(module); + // AliITSgeomTGeo::GetModuleIndex() issues an error in case the arguments + // are illegal and returns -1 + Int_t firMod = TMath::Max(0,AliITSgeomTGeo::GetModuleIndex(5,1,1)); + Int_t lasMod = AliITSgeomTGeo::GetNModules(); + for(Int_t module = firMod; module < lasMod; module++){ + recpoints = rpcont->UncheckedGetClusters(module); npoints += recpoints->GetEntries(); AliITSgeomTGeo::GetModuleId(module,gLayer,gLadder,gModule); //printf("SSDDataMAkerRec:::::::::::::::::::::::gLayer ========== %d \n\n",gLayer); @@ -1572,75 +1599,74 @@ Int_t AliITSQASSDDataMakerRec::MakeRecPoints(TTree *clustersTree) Double_t chargeNSide = clusterCharge*(1. - chargeRatio); if(layer == 4) { //printf("-*-*-*-*-*-***************AliITSQASSDataMakerRec::MakeRecpoints Filling 4 called \n"); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 20)->Fill(recp->GetType()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 20,recp->GetType()); if(recp->GetType() != 1) continue; - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 0)->Fill(module); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 4)->Fill(recp->GetDetLocalX()); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 6)->Fill(recp->GetDetLocalZ()); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 8)->Fill(cluglo[0]); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 10)->Fill(cluglo[1]); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 12)->Fill(cluglo[2]); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 14)->Fill(phi); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 16)->Fill(theta); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 18)->Fill(radius); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 22)->Fill(recp->GetChargeRatio()); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 24)->Fill(recp->GetQ()); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 26)->Fill(chargePSide); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 28)->Fill(chargeNSide); - if(chargePSide != 0.) fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 30)->Fill(chargeNSide/chargePSide); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 32)->Fill(chargePSide,chargeNSide); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 34)->SetBinContent(gModule,lLadderLocationY,recp->GetQ()); - ((TH2F *)fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 36))->Fill(gModule,499+gLadder,1); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 0,module); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 4,recp->GetDetLocalX()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 6,recp->GetDetLocalZ()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 8,cluglo[0]); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 10,cluglo[1]); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 12,cluglo[2]); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 14,phi); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 16,theta); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 18,radius); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 22,recp->GetChargeRatio()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 24,recp->GetQ()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 26,chargePSide); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 28,chargeNSide); + if(chargePSide != 0.) fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 30,chargeNSide/chargePSide); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 32,chargePSide,chargeNSide); + fAliITSQADataMakerRec->SetRecPointsDataBinContent(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 34,gModule,lLadderLocationY,recp->GetQ()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 36,gModule,499+gLadder,1); nClustersLayer5 += 1; }//layer 5 histograms if(layer == 5) { //printf("-*-*-*-*-*-***************AliITSQASSDataMakerRec::MakeRecpoints Filling 5 called \n"); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 21)->Fill(recp->GetType()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 21,recp->GetType()); if(recp->GetType() != 1) continue; - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 1)->Fill(module); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 5)->Fill(recp->GetDetLocalX()); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 7)->Fill(recp->GetDetLocalZ()); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 9)->Fill(cluglo[0]); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 11)->Fill(cluglo[1]); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 13)->Fill(cluglo[2]); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 15)->Fill(phi); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 17)->Fill(theta); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 19)->Fill(radius); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 23)->Fill(recp->GetChargeRatio()); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 25)->Fill(recp->GetQ()); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 27)->Fill(chargePSide); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 29)->Fill(chargeNSide); - if(chargePSide != 0.) fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 31)->Fill(chargeNSide/chargePSide); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 33)->Fill(chargePSide,chargeNSide); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 35)->SetBinContent(gModule,lLadderLocationY,recp->GetQ()); - ((TH2F *)fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 37))->Fill(gModule,599+gLadder,1); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 1,module); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 5,recp->GetDetLocalX()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 7,recp->GetDetLocalZ()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 9,cluglo[0]); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 11,cluglo[1]); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 13,cluglo[2]); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 15,phi); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 17,theta); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 19,radius); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 23,recp->GetChargeRatio()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 25,recp->GetQ()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 27,chargePSide); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 29,chargeNSide); + if(chargePSide != 0.) fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 31,chargeNSide/chargePSide); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 33,chargePSide,chargeNSide); + fAliITSQADataMakerRec->SetRecPointsDataBinContent(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 35,gModule,lLadderLocationY,recp->GetQ()); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 37,gModule,599+gLadder,1); nClustersLayer6 += 1; }//layer 6 histograms }//rec. points loop }//module loop //printf("-*-*-*-*-*-***************AliITSQASSDataMakerRec::MakeRecpoints Filling called \n"); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 2)->Fill(nClustersLayer5); - fAliITSQADataMakerRec->GetRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 3)->Fill(nClustersLayer6); - - statRecpoints.Clear(); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 2,nClustersLayer5); + fAliITSQADataMakerRec->FillRecPointsData(fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()] + 3,nClustersLayer6); + // return rv ; } //____________________________________________________________________________ -Int_t AliITSQASSDDataMakerRec::GetOffset(AliQAv1::TASKINDEX_t task) { +Int_t AliITSQASSDDataMakerRec::GetOffset(AliQAv1::TASKINDEX_t task,Int_t specie) const { // Returns offset number according to the specified task Int_t offset=0; if( task == AliQAv1::kRAWS ) { - offset=fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()]; + offset=fGenRawsOffset[specie]; } else if( task == AliQAv1::kDIGITSR ) { - offset=fGenDigitsOffset[fAliITSQADataMakerRec->GetEventSpecie()]; + offset=fGenDigitsOffset[specie]; } else if( task == AliQAv1::kRECPOINTS ) { - offset=fGenRecPointsOffset[fAliITSQADataMakerRec->GetEventSpecie()]; + offset=fGenRecPointsOffset[specie]; } return offset; @@ -1681,3 +1707,12 @@ Int_t AliITSQASSDDataMakerRec::GetTaskHisto(AliQAv1::TASKINDEX_t task) { return histotot; } + +//____________________________________________________________________________ +void AliITSQASSDDataMakerRec::ResetDetector(AliQAv1::TASKINDEX_t task) +{ + if(task==AliQAv1::kRAWS) { + ResetRawsMonitoredObjects(); + } + +}