X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSDetTypeSim.cxx;h=8be79cd2e493b03c16fbf1d54c2d815d06b43704;hb=051db1cf605112d1929409ba9f98f3b4f08d410b;hp=57b662ac018d53c8f605b4c21009b9d858d37d57;hpb=54af1addac9b317077543cb8f3e5e13eeff8bcec;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITSDetTypeSim.cxx b/ITS/AliITSDetTypeSim.cxx index 57b662ac018..8be79cd2e49 100644 --- a/ITS/AliITSDetTypeSim.cxx +++ b/ITS/AliITSDetTypeSim.cxx @@ -48,7 +48,6 @@ #include "AliITSCorrMapSDD.h" #include "AliITSDriftSpeedArraySDD.h" #include "AliITSDriftSpeedSDD.h" -#include "AliITSHLTforSDD.h" #include "AliITSCalibrationSSD.h" #include "AliITSNoiseSSDv2.h" #include "AliITSGainSSDv2.h" @@ -64,6 +63,7 @@ #include "AliITSsimulationSPD.h" #include "AliITSsimulationSDD.h" #include "AliITSsimulationSSD.h" +#include "AliITSresponseSDD.h" #include "AliITSDDLModuleMapSDD.h" #include "AliITSTriggerConditions.h" #include "AliBaseLoader.h" @@ -73,6 +73,8 @@ const Int_t AliITSDetTypeSim::fgkDefaultNModulesSPD = 240; const Int_t AliITSDetTypeSim::fgkDefaultNModulesSDD = 260; const Int_t AliITSDetTypeSim::fgkDefaultNModulesSSD = 1698; +using std::endl; +using std::cout; ClassImp(AliITSDetTypeSim) //---------------------------------------------------------------------- @@ -83,6 +85,7 @@ fSegmentation(), // [NDet] fCalibration(), // [NMod] fSSDCalibration(0), fSPDNoisy(0), +fSPDSparseDead(0), fNSDigits(0), //! number of SDigits fSDigits("AliITSpListItem",1000), fNDigits(0), //! number of Digits @@ -90,10 +93,11 @@ fRunNumber(0), //! Run number (to access DB) fDigits(), //! [NMod][NDigits] fSimuPar(0), fDDLMapSDD(0), +fRespSDD(0), +fAveGainSDD(0), fkDigClassName(), // String with digit class name. fLoader(0), // local pointer to loader fFirstcall(kTRUE), -fIsHLTmodeC(0), // flag fFOGenerator(), fTriggerConditions(NULL) { @@ -113,9 +117,6 @@ fTriggerConditions(NULL) fDDLMapSDD=new AliITSDDLModuleMapSDD(); fSimuPar= new AliITSSimuParam(); fSSDCalibration=new AliITSCalibrationSSD(); - fNMod[0] = fgkDefaultNModulesSPD; - fNMod[1] = fgkDefaultNModulesSDD; - fNMod[2] = fgkDefaultNModulesSSD; SetRunNumber(); } //---------------------------------------------------------------------- @@ -144,7 +145,12 @@ AliITSDetTypeSim::~AliITSDetTypeSim(){ delete fCalibration; } fCalibration = 0; - if(fSSDCalibration) delete fSSDCalibration; + if(fSSDCalibration) { + if(!(AliCDBManager::Instance()->GetCacheFlag())) { + delete fSSDCalibration; + fSSDCalibration = NULL; + } + } if(fSPDNoisy){ if(!(AliCDBManager::Instance()->GetCacheFlag())) { fSPDNoisy->Delete(); @@ -152,7 +158,20 @@ AliITSDetTypeSim::~AliITSDetTypeSim(){ fSPDNoisy = 0; } } + if(fSPDSparseDead){ + if(!(AliCDBManager::Instance()->GetCacheFlag())) { + fSPDSparseDead->Delete(); + delete fSPDSparseDead; + fSPDSparseDead = 0; + } + } if(fSimuPar) delete fSimuPar; + if(fRespSDD){ + if(!(AliCDBManager::Instance()->GetCacheFlag())){ + delete fRespSDD; + fRespSDD=0; + } + } if(fDDLMapSDD) delete fDDLMapSDD; if(fNDigits) delete [] fNDigits; fNDigits = 0; @@ -166,39 +185,41 @@ AliITSDetTypeSim::~AliITSDetTypeSim(){ fDigits=0; } //---------------------------------------------------------------------- -AliITSDetTypeSim::AliITSDetTypeSim(const AliITSDetTypeSim &source) : TObject(source), -fSimulation(source.fSimulation), // [NDet] -fSegmentation(source.fSegmentation), // [NDet] -fCalibration(source.fCalibration), // [NMod] -fSSDCalibration(source.fSSDCalibration), -fSPDNoisy(source.fSPDNoisy), -fNSDigits(source.fNSDigits), //! number of SDigits -fSDigits(*((TClonesArray*)source.fSDigits.Clone())), -fNDigits(source.fNDigits), //! number of Digits -fRunNumber(source.fRunNumber), //! Run number (to access DB) -fDigits(source.fDigits), //! [NMod][NDigits] -fSimuPar(source.fSimuPar), -fDDLMapSDD(source.fDDLMapSDD), -fkDigClassName(), // String with digit class name. -fLoader(source.fLoader), // local pointer to loader -fFirstcall(source.fFirstcall), -fIsHLTmodeC(source.fIsHLTmodeC), -fFOGenerator(source.fFOGenerator), -fTriggerConditions(source.fTriggerConditions) -{ - // Copy Constructor for object AliITSDetTypeSim not allowed - for(Int_t i=0;i~AliITSDetTypeSim(); - new(this) AliITSDetTypeSim(source); - return *this; -} +// this->~AliITSDetTypeSim(); +// new(this) AliITSDetTypeSim(source); +// return *this; +// } //______________________________________________________________________ void AliITSDetTypeSim::SetITSgeom(AliITSgeom *geom){ @@ -359,6 +380,19 @@ void AliITSDetTypeSim::SetSPDNoisyModel(Int_t iMod, AliITSCalibration *cal){ delete (AliITSCalibration*) fSPDNoisy->At(iMod); fSPDNoisy->AddAt(cal,iMod); } +//_______________________________________________________________________ +void AliITSDetTypeSim::SetSPDSparseDeadModel(Int_t iMod, AliITSCalibration *cal){ + //Set sparse dead pixel info for the SPD module iMod + if (fSPDSparseDead==0) { + fSPDSparseDead = new TObjArray(fgkDefaultNModulesSPD); + fSPDSparseDead->SetOwner(kTRUE); + fSPDSparseDead->Clear(); + } + + if (fSPDNoisy->At(iMod) != 0) + delete (AliITSCalibration*) fSPDNoisy->At(iMod); + fSPDNoisy->AddAt(cal,iMod); +} //______________________________________________________________________ void AliITSDetTypeSim::ResetCalibrationArray(){ //resets response array @@ -462,9 +496,9 @@ Bool_t AliITSDetTypeSim::GetCalibration() { AliCDBEntry *foEffSPD = AliCDBManager::Instance()->Get("ITS/Calib/SPDFOEfficiency", run); AliCDBEntry *foNoiSPD = AliCDBManager::Instance()->Get("ITS/Calib/SPDFONoise", run); AliCDBEntry *entrySDD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSDD", run); + AliCDBEntry *entry2SDD = AliCDBManager::Instance()->Get("ITS/Calib/RespSDD"); AliCDBEntry *drSpSDD = AliCDBManager::Instance()->Get("ITS/Calib/DriftSpeedSDD",run); AliCDBEntry *ddlMapSDD = AliCDBManager::Instance()->Get("ITS/Calib/DDLMapSDD",run); - AliCDBEntry *hltforSDD = AliCDBManager::Instance()->Get("ITS/Calib/HLTforSDD"); //AliCDBEntry *mapASDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsAnodeSDD",run); AliCDBEntry *mapTSDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsTimeSDD",run); // AliCDBEntry *entrySSD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSSD", run); @@ -473,8 +507,8 @@ Bool_t AliITSDetTypeSim::GetCalibration() { AliCDBEntry *entryBadChannelsSSD = AliCDBManager::Instance()->Get("ITS/Calib/BadChannelsSSD"); if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD - || !entrySDD || !entryNoiseSSD || !entryGainSSD || !entryBadChannelsSSD - || !drSpSDD || !ddlMapSDD || !hltforSDD || !mapTSDD){ + || !entrySDD || !entry2SDD || !entryNoiseSSD || !entryGainSSD || !entryBadChannelsSSD + || !drSpSDD || !ddlMapSDD || !mapTSDD){ AliFatal("Calibration object retrieval failed! "); return kFALSE; } @@ -500,6 +534,10 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD if(!isCacheActive)entrySDD->SetObject(NULL); entrySDD->SetOwner(kTRUE); + AliITSresponseSDD *pSDD = (AliITSresponseSDD*)entry2SDD->GetObject(); + if(!isCacheActive)entry2SDD->SetObject(NULL); + entry2SDD->SetOwner(kTRUE); + TObjArray *drSp = (TObjArray *)drSpSDD->GetObject(); if(!isCacheActive)drSpSDD->SetObject(NULL); drSpSDD->SetOwner(kTRUE); @@ -508,10 +546,6 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD if(!isCacheActive)ddlMapSDD->SetObject(NULL); ddlMapSDD->SetOwner(kTRUE); - AliITSHLTforSDD* hltsdd=(AliITSHLTforSDD*)hltforSDD->GetObject(); - if(!isCacheActive)hltforSDD->SetObject(NULL); - hltforSDD->SetOwner(kTRUE); - // TObjArray *mapAn = (TObjArray *)mapASDD->GetObject(); // if(!isCacheActive)mapASDD->SetObject(NULL); // mapASDD->SetOwner(kTRUE); @@ -526,11 +560,12 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD entrySSD->SetOwner(kTRUE); */ - TObject *emptyssd = 0; TString ssdobjectname = 0; - AliITSNoiseSSDv2 *noiseSSD = new AliITSNoiseSSDv2(); + TObject *emptyssd = 0; TString ssdobjectname; + AliITSNoiseSSDv2 *noiseSSD = NULL; emptyssd = (TObject *)entryNoiseSSD->GetObject(); ssdobjectname = emptyssd->GetName(); if(ssdobjectname=="TObjArray") { + noiseSSD = new AliITSNoiseSSDv2(); TObjArray *noiseSSDOld = (TObjArray *)entryNoiseSSD->GetObject(); ReadOldSSDNoise(noiseSSDOld, noiseSSD); } @@ -539,11 +574,12 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD if(!isCacheActive)entryNoiseSSD->SetObject(NULL); entryNoiseSSD->SetOwner(kTRUE); - AliITSGainSSDv2 *gainSSD = new AliITSGainSSDv2(); + AliITSGainSSDv2 *gainSSD = NULL; emptyssd = (TObject *)entryGainSSD->GetObject(); ssdobjectname = emptyssd->GetName(); if(ssdobjectname=="Gain") { TObjArray *gainSSDOld = (TObjArray *)entryGainSSD->GetObject(); + gainSSD = new AliITSGainSSDv2(); ReadOldSSDGain(gainSSDOld, gainSSD); } else if(ssdobjectname=="AliITSGainSSDv2") @@ -551,11 +587,12 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD if(!isCacheActive)entryGainSSD->SetObject(NULL); entryGainSSD->SetOwner(kTRUE); - AliITSBadChannelsSSDv2 *badChannelsSSD = new AliITSBadChannelsSSDv2(); + AliITSBadChannelsSSDv2 *badChannelsSSD = NULL; emptyssd = (TObject *)entryBadChannelsSSD->GetObject(); ssdobjectname = emptyssd->GetName(); if(ssdobjectname=="TObjArray") { TObjArray *badChannelsSSDOld = (TObjArray *)entryBadChannelsSSD->GetObject(); + badChannelsSSD = new AliITSBadChannelsSSDv2(); ReadOldSSDBadChannels(badChannelsSSDOld, badChannelsSSD); } else if(ssdobjectname=="AliITSBadChannelsSSDv2") @@ -583,11 +620,11 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD delete foEffSPD; delete foNoiSPD; delete entrySDD; + delete entry2SDD; delete entryNoiseSSD; delete entryGainSSD; delete entryBadChannelsSSD; // delete mapASDD; - delete hltforSDD; delete mapTSDD; delete drSpSDD; delete ddlMapSDD; @@ -596,20 +633,20 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD AliCDBManager::Instance()->SetCacheFlag(origCacheStatus); if ((!calDeadSPD) || (!calNoisySPD) || (!calFoEffSPD) || (!calFoNoiSPD) - || (!calSDD) || (!drSp) || (!ddlsdd) || (!hltsdd) + || (!calSDD) || (!pSDD)|| (!drSp) || (!ddlsdd) || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badChannelsSSD)) { AliWarning("Can not get calibration from calibration database !"); return kFALSE; } - fNMod[0] = calDeadSPD->GetEntries(); - fNMod[1] = calSDD->GetEntries(); - // fNMod[2] = noiseSSD->GetEntries(); - AliInfo(Form("%i SPD, %i SDD and %i SSD in calibration database", - fNMod[0], fNMod[1], fNMod[2])); + Int_t nmods0 = calDeadSPD->GetEntries(); + Int_t nmods1 = calSDD->GetEntries(); + + AliDebug(1,Form("%i SPD, %i SDD and %i SSD in calibration database", + nmods0,nmods1,fgkDefaultNModulesSSD)); AliITSCalibration* cal; - for (Int_t i=0; iAt(i); SetCalibrationModel(i, cal); cal = (AliITSCalibration*) calNoisySPD->At(i); @@ -620,7 +657,9 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD fFOGenerator.SetNoise(calFoNoiSPD); // this cal object is used only by the generator fDDLMapSDD->SetDDLMap(ddlsdd); - fIsHLTmodeC=hltsdd->IsHLTmodeC(); + fRespSDD=pSDD; + Float_t avegain=0.; + Float_t nGdAnodes=0; Bool_t oldMapFormat=kFALSE; TObject* objmap=(TObject*)mapT->At(0); TString cname(objmap->ClassName()); @@ -645,6 +684,11 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD AliWarning(Form("SDD module %d not present in DDL map: set it as dead",iMod)); }else{ cal = (AliITSCalibration*) calSDD->At(i); + for(Int_t iAnode=0;iAnode< ((AliITSCalibrationSDD*)cal)->NOfAnodes(); iAnode++){ + if(((AliITSCalibrationSDD*)cal)->IsBadChannel(iAnode)) continue; + avegain+= ((AliITSCalibrationSDD*)cal)->GetChannelGain(iAnode); + nGdAnodes++; + } Int_t i0=2*i; Int_t i1=1+2*i; AliITSDriftSpeedArraySDD* arr0 = (AliITSDriftSpeedArraySDD*) drSp->At(i0); @@ -668,7 +712,8 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD SetCalibrationModel(iMod, cal); } } - + if(nGdAnodes) fAveGainSDD=avegain/nGdAnodes; + AliDebug(3,Form("SDD average gain=%f\n",fAveGainSDD)); fSSDCalibration->SetNoise(noiseSSD); fSSDCalibration->SetGain(gainSSD); fSSDCalibration->SetBadChannels(badChannelsSSD); @@ -731,14 +776,12 @@ void AliITSDetTypeSim::SetDefaultSimulation(){ //___________________________________________________________________ void AliITSDetTypeSim::SetTreeAddressS(TTree* treeS, const Char_t* name){ // Set branch address for the ITS summable digits Trees. - char branchname[30]; if(!treeS){ return; } TBranch *branch; - sprintf(branchname,"%s",name); - branch = treeS->GetBranch(branchname); + branch = treeS->GetBranch(name); TClonesArray *sdigi = &fSDigits; if (branch) branch->SetAddress(&sdigi); @@ -750,7 +793,7 @@ void AliITSDetTypeSim::SetTreeAddressD(TTree* treeD, const Char_t* name){ const char *det[3] = {"SPD","SDD","SSD"}; TBranch *branch; - char branchname[30]; + TString branchname; if(!treeD){ return; @@ -773,14 +816,11 @@ void AliITSDetTypeSim::SetTreeAddressD(TTree* treeD, const Char_t* name){ ResetDigits(i); } - if(fgkNdettypes==3) sprintf(branchname,"%sDigits%s",name,det[i]); - else sprintf(branchname,"%sDigits%d",name,i+1); - if(fDigits){ - branch = treeD->GetBranch(branchname); - if(branch) branch->SetAddress(&((*fDigits)[i])); - } + if(fgkNdettypes==3) branchname.Form("%sDigits%s",name,det[i]); + else branchname.Form("%sDigits%d",name,i+1); + branch = treeD->GetBranch(branchname.Data()); + if(branch) branch->SetAddress(&((*fDigits)[i])); } - } //___________________________________________________________________ void AliITSDetTypeSim::ResetDigits(){ @@ -818,8 +858,8 @@ void AliITSDetTypeSim::SDigitsToDigits(Option_t* opt, Char_t* name){ const char *all = strstr(opt,"All"); const char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"), strstr(opt,"SSD")}; - if( !det[0] && !det[1] && !det[2] ) all = "All"; - else all = 0; + if(!all && !det[0] && !det[1] && !det[2] ) all = "All"; + static Bool_t setDef = kTRUE; if(setDef) SetDefaultSimulation(); setDef = kFALSE; @@ -830,7 +870,7 @@ void AliITSDetTypeSim::SDigitsToDigits(Option_t* opt, Char_t* name){ Error("SDigits2Digits","Error: No trees or SDigits. Returning."); return; } - sprintf(name,"%s",name); + TBranch* brchSDigits = trees->GetBranch(name); Int_t id; @@ -853,6 +893,8 @@ void AliITSDetTypeSim::SDigitsToDigits(Option_t* opt, Char_t* name){ fLoader->TreeD()->Fill(); ResetDigits(); } + + WriteFOSignals(); fLoader->TreeD()->GetEntries(); fLoader->TreeD()->AutoSave(); fLoader->TreeD()->Reset(); @@ -986,7 +1028,7 @@ AliITSTriggerConditions* AliITSDetTypeSim::GetTriggerConditions() { if (fRunNumber<0) isCacheActive=kFALSE; else isCacheActive=kTRUE; AliCDBManager::Instance()->SetCacheFlag(isCacheActive); - AliCDBEntry *pitCond = AliCDBManager::Instance()->Get("ITS/Calib/PITConditions", fRunNumber); + AliCDBEntry *pitCond = AliCDBManager::Instance()->Get("TRIGGER/SPD/PITConditions", fRunNumber); if (!pitCond) { AliError("Trigger conditions retrieval failed! "); return NULL; @@ -1020,5 +1062,6 @@ void AliITSDetTypeSim::WriteFOSignals() { TTree *tree = fLoader->TreeD(); AliITSFOSignalsSPD *foSignals = new AliITSFOSignalsSPD(*GetFOSignals()); tree->GetUserInfo()->Add(foSignals); + fFOGenerator.ResetSignals(); }