#include "AliITSpListItem.h"
#include "AliITSresponseSDD.h"
#include "AliITSCalibrationSDD.h"
+#include "AliITSMapSDD.h"
+#include "AliITSDriftSpeedArraySDD.h"
+#include "AliITSDriftSpeedSDD.h"
#include "AliITSCalibrationSSD.h"
#include "AliITSNoiseSSD.h"
#include "AliITSGainSSD.h"
fPreProcess(), // [] e.g. Fill fHitModule with hits
fPostProcess(), // [] e.g. Wright Raw data
fNSDigits(0), //! number of SDigits
-fSDigits(), //! [NMod][NSDigits]
+fSDigits("AliITSpListItem",1000),
fNDigits(0), //! number of Digits
fRunNumber(0), //! Run number (to access DB)
fDigits(), //! [NMod][NDigits]
+fSimuPar(0),
+fDDLMapSDD(0),
fHitClassName(), // String with Hit class name.
fSDigClassName(),// String with SDigit class name.
fDigClassName(), // String with digit class name.
fSimulation = new TObjArray(fgkNdettypes);
fSegmentation = new TObjArray(fgkNdettypes);
fSegmentation->SetOwner(kTRUE);
- fSDigits = new TClonesArray("AliITSpListItem",1000);
fDigits = new TObjArray(fgkNdettypes);
fNDigits = new Int_t[fgkNdettypes];
+ fDDLMapSDD=new AliITSDDLModuleMapSDD();
+ fSimuPar= new AliITSSimuParam();
fNMod[0] = fgkDefaultNModulesSPD;
fNMod[1] = fgkDefaultNModulesSDD;
fNMod[2] = fgkDefaultNModulesSSD;
delete fPostProcess;
}
fPostProcess = 0;
+ if(fSimuPar) delete fSimuPar;
+ if(fDDLMapSDD) delete fDDLMapSDD;
if(fNDigits) delete [] fNDigits;
fNDigits = 0;
if (fLoader)fLoader->GetModulesFolder()->Remove(this);
fLoader = 0; // Not deleting it.
- if (fSDigits) {
- fSDigits->Delete();
- delete fSDigits;
- }
- fSDigits=0;
+ fSDigits.Delete();
if (fDigits) {
fDigits->Delete();
delete fDigits;
fPreProcess(source.fPreProcess), // [] e.g. Fill fHitModule with hits
fPostProcess(source.fPostProcess), // [] e.g. Wright Raw data
fNSDigits(source.fNSDigits), //! number of SDigits
-fSDigits(source.fSDigits), //! [NMod][NSDigits]
+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),
fHitClassName(source.fHitClassName), // String with Hit class name.
fSDigClassName(source.fSDigClassName),// String with SDigit class name.
fDigClassName(), // String with digit class name.
if(GetSegmentationModel(idet))
delete (AliITSsegmentation*)fSegmentation->At(idet);
if(idet==0){
- seg = new AliITSsegmentationSPD(GetITSgeom());
+ seg = new AliITSsegmentationSPD();
}else if(idet==1){
- AliITSCalibration* res=GetCalibrationModel(
- GetITSgeom()->GetStartSDD());
- seg = new AliITSsegmentationSDD(GetITSgeom(),res);
+ seg = new AliITSsegmentationSDD();
}else {
- seg = new AliITSsegmentationSSD(GetITSgeom());
+ seg = new AliITSsegmentationSSD();
}
SetSegmentationModel(idet,seg);
}
ResetSegmentation();
if(!GetCalibration()){AliFatal("Exit"); exit(0);}
+ SetDigitClassName(0,"AliITSdigitSPD");
+ SetDigitClassName(1,"AliITSdigitSDD");
+ SetDigitClassName(2,"AliITSdigitSSD");
+
for(Int_t idet=0;idet<fgkNdettypes;idet++){
- //SPD
- if(idet==0){
- if(!GetSegmentationModel(idet)) SetDefaultSegmentation(idet);
- const char *kData0=(GetCalibrationModel(GetITSgeom()->GetStartSPD()))->DataType();
- if (strstr(kData0,"real")) {
- SetDigitClassName(idet,"AliITSdigit");
- }else {
- SetDigitClassName(idet,"AliITSdigitSPD");
- } // end if
- } // end if idet==0
- //SDD
- if(idet==1){
- if(!GetSegmentationModel(idet)) SetDefaultSegmentation(idet);
- AliITSCalibrationSDD* rsp =
- (AliITSCalibrationSDD*)GetCalibrationModel(
- GetITSgeom()->GetStartSDD());
- const char *kopt = ((AliITSresponseSDD*)rsp->GetResponse())->
- ZeroSuppOption();
- if((!strstr(kopt,"2D"))&&(!strstr(kopt,"1D"))) {
- SetDigitClassName(idet,"AliITSdigit");
- }else {
- SetDigitClassName(idet,"AliITSdigitSDD");
- } // end if
- } // end if idet==1
- //SSD
- if(idet==2){
- if(!GetSegmentationModel(idet))SetDefaultSegmentation(idet);
- const char *kData2 = (GetCalibrationModel(
- GetITSgeom()->GetStartSSD())->DataType());
- if (strstr(kData2,"real")) {
- SetDigitClassName(idet,"AliITSdigit");
- }else {
- SetDigitClassName(idet,"AliITSdigitSSD");
- } // end if
- } // end if idet==2
- }// end for idet
+ if(!GetSegmentationModel(idet)) SetDefaultSegmentation(idet);
+ }
}
//______________________________________________________________________
Bool_t AliITSDetTypeSim::GetCalibration() {
AliCDBManager::Instance()->SetCacheFlag(isCacheActive);
- AliCDBEntry *entrySPD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSPD", run);
+ AliCDBEntry *entrySPD = AliCDBManager::Instance()->Get("ITS/Calib/SPDDead", run);
AliCDBEntry *entrySDD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSDD", run);
+ AliCDBEntry *drSpSDD = AliCDBManager::Instance()->Get("ITS/Calib/DriftSpeedSDD",run);
+ AliCDBEntry *ddlMapSDD = AliCDBManager::Instance()->Get("ITS/Calib/DDLMapSDD",run);
+ 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);
- AliCDBEntry *entryNoiseSSD = AliCDBManager::Instance()->Get("ITS/Calib/NoiseSSD");
- AliCDBEntry *entryGainSSD = AliCDBManager::Instance()->Get("ITS/Calib/GainSSD");
- AliCDBEntry *entryBadChannelsSSD = AliCDBManager::Instance()->Get("ITS/Calib/BadChannelsSSD");
+ AliCDBEntry *entryNoiseSSD = AliCDBManager::Instance()->Get("ITS/Calib/NoiseSSD");
+ AliCDBEntry *entryGainSSD = AliCDBManager::Instance()->Get("ITS/Calib/GainSSD");
+ AliCDBEntry *entryBadChannelsSSD = AliCDBManager::Instance()->Get("ITS/Calib/BadChannelsSSD");
AliCDBEntry *entry2SPD = AliCDBManager::Instance()->Get("ITS/Calib/RespSPD", run);
AliCDBEntry *entry2SDD = AliCDBManager::Instance()->Get("ITS/Calib/RespSDD", run);
AliCDBEntry *entry2SSD = AliCDBManager::Instance()->Get("ITS/Calib/RespSSD", run);
if(!entrySPD || !entrySDD || !entryNoiseSSD || !entryGainSSD || !entryBadChannelsSSD ||
- !entry2SPD || !entry2SDD || !entry2SSD){
+ !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapASDD ||!mapTSDD){
AliFatal("Calibration object retrieval failed! ");
return kFALSE;
}
- if(!entrySPD || !entrySDD || !entryNoiseSSD || !entryGainSSD || !entryBadChannelsSSD ||
- !entry2SPD || !entry2SDD || !entry2SSD){
- AliFatal("Calibration object retrieval failed! ");
- return kFALSE;
- }
+// if(!entrySPD || !entrySDD || !entryNoiseSSD || !entryGainSSD || !entryBadChannelsSSD ||
+// !entry2SPD || !entry2SDD || !entry2SSD){
+// AliFatal("Calibration object retrieval failed! ");
+// return kFALSE;
+// }
TObjArray *calSPD = (TObjArray *)entrySPD->GetObject();
if(!isCacheActive)entrySPD->SetObject(NULL);
if(!isCacheActive)entry2SDD->SetObject(NULL);
entry2SDD->SetOwner(kTRUE);
+ TObjArray *drSp = (TObjArray *)drSpSDD->GetObject();
+ if(!isCacheActive)drSpSDD->SetObject(NULL);
+ drSpSDD->SetOwner(kTRUE);
+
+ AliITSDDLModuleMapSDD *ddlsdd=(AliITSDDLModuleMapSDD*)ddlMapSDD->GetObject();
+ if(!isCacheActive)ddlMapSDD->SetObject(NULL);
+ ddlMapSDD->SetOwner(kTRUE);
+
+ TObjArray *mapAn = (TObjArray *)mapASDD->GetObject();
+ if(!isCacheActive)mapASDD->SetObject(NULL);
+ mapASDD->SetOwner(kTRUE);
+
+ TObjArray *mapT = (TObjArray *)mapTSDD->GetObject();
+ if(!isCacheActive)mapTSDD->SetObject(NULL);
+ mapTSDD->SetOwner(kTRUE);
+
/*
TObjArray *calSSD = (TObjArray *)entrySSD->GetObject();
if(!isCacheActive)entrySSD->SetObject(NULL);
delete entry2SPD;
delete entry2SDD;
delete entry2SSD;
+ delete mapASDD;
+ delete mapTSDD;
+ delete drSpSDD;
+ delete ddlMapSDD;
}
AliCDBManager::Instance()->SetCacheFlag(origCacheStatus);
- if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!calSDD)
- || (!noiseSSD)|| (!gainSSD)|| (!badchannelsSSD)) {
+ if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!calSDD) || (!drSp) || (!ddlsdd)
+ || (!mapAn) || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badchannelsSSD)) {
AliWarning("Can not get calibration from calibration database !");
return kFALSE;
}
cal = (AliITSCalibration*) calSPD->At(i);
cal->SetResponse(pSPD);
SetCalibrationModel(i, cal);
- }
- for (Int_t i=0; i<fNMod[1]; i++) {
- cal = (AliITSCalibration*) calSDD->At(i);
- cal->SetResponse(pSDD);
- Int_t iMod = i + fNMod[0];
- SetCalibrationModel(iMod, cal);
- }
+ }
+
+ fDDLMapSDD->SetDDLMap(ddlsdd);
+
+ for (Int_t i=0; i<fgkDefaultNModulesSDD; i++) {
+ Int_t iddl,icarlos;
+ Int_t iMod = i + fgkDefaultNModulesSPD;
+ fDDLMapSDD->FindInDDLMap(iMod,iddl,icarlos);
+ if(iddl<0){
+ AliITSCalibrationSDD* calsdddead=new AliITSCalibrationSDD();
+ calsdddead->SetResponse(pSDD);
+ calsdddead->SetBad();
+ AliITSDriftSpeedSDD* driftspdef = new AliITSDriftSpeedSDD();
+ AliITSDriftSpeedArraySDD* arrdrsp=new AliITSDriftSpeedArraySDD(1);
+ arrdrsp->AddDriftSpeed(driftspdef);
+ calsdddead->SetDriftSpeed(0,arrdrsp);
+ calsdddead->SetDriftSpeed(1,arrdrsp);
+ SetCalibrationModel(iMod, calsdddead);
+ AliWarning(Form("SDD module %d not present in DDL map: set it as dead",iMod));
+ }else{
+ cal = (AliITSCalibration*) calSDD->At(i);
+ cal->SetResponse(pSDD);
+ Int_t i0=2*i;
+ Int_t i1=1+2*i;
+ AliITSDriftSpeedArraySDD* arr0 = (AliITSDriftSpeedArraySDD*) drSp->At(i0);
+ AliITSMapSDD* ma0 = (AliITSMapSDD*)mapAn->At(i0);
+ AliITSMapSDD* mt0 = (AliITSMapSDD*)mapT->At(i0);
+ AliITSDriftSpeedArraySDD* arr1 = (AliITSDriftSpeedArraySDD*) drSp->At(i1);
+ AliITSMapSDD* ma1 = (AliITSMapSDD*)mapAn->At(i1);
+ AliITSMapSDD* mt1 = (AliITSMapSDD*)mapT->At(i1);
+ cal->SetDriftSpeed(0,arr0);
+ cal->SetDriftSpeed(1,arr1);
+ cal->SetMapA(0,ma0);
+ cal->SetMapA(1,ma1);
+ cal->SetMapT(0,mt0);
+ cal->SetMapT(1,mt1);
+ SetCalibrationModel(iMod, cal);
+ }
+ }
+
for (Int_t i=0; i<fNMod[2]; i++) {
AliITSCalibrationSSD *calibSSD = new AliITSCalibrationSSD();
calibSSD->SetResponse((AliITSresponse*)pSSD);
AliITSBadChannelsSSD *bad = (AliITSBadChannelsSSD*) (badchannelsSSD->At(i));
calibSSD->SetBadChannels(bad);
- Int_t iMod = i + fNMod[0] + fNMod[1];
+ Int_t iMod = i + fgkDefaultNModulesSPD + fgkDefaultNModulesSDD;
SetCalibrationModel(iMod, calibSSD);
}
if(!treeS){
return;
}
- if (fSDigits == 0x0){
- fSDigits = new TClonesArray("AliITSpListItem",1000);
- }
TBranch *branch;
sprintf(branchname,"%s",name);
branch = treeS->GetBranch(branchname);
- if (branch) branch->SetAddress(&fSDigits);
+ TClonesArray *sdigi = &fSDigits;
+ if (branch) branch->SetAddress(&sdigi);
}
//___________________________________________________________________
}
sim->InitSimulationModule(module,gAlice->GetEvNumber());
- fSDigits->Clear();
+ fSDigits.Clear();
brchSDigits->GetEvent(module);
- sim->AddSDigitsToModule(fSDigits,0);
+ sim->AddSDigitsToModule(&fSDigits,0);
sim->FinishSDigitiseModule();
fLoader->TreeD()->Fill();
ResetDigits();
void AliITSDetTypeSim::AddSumDigit(AliITSpListItem &sdig){
//Adds the module full of summable digits to the summable digits tree.
- TClonesArray &lsdig = *fSDigits;
- new(lsdig[fNSDigits++]) AliITSpListItem(sdig);
-}
-//__________________________________________________________
-void AliITSDetTypeSim::AddRealDigit(Int_t branch, Int_t *digits){
- // Add a real digit - as coming from data.
-
- TClonesArray &ldigits = *((TClonesArray*)fDigits->At(branch));
- new(ldigits[fNDigits[branch]++]) AliITSdigit(digits);
+ new(fSDigits[fNSDigits++]) AliITSpListItem(sdig);
}
//__________________________________________________________
void AliITSDetTypeSim::AddSimDigit(Int_t branch, AliITSdigit* d){
}
//______________________________________________________________________
void AliITSDetTypeSim::AddSimDigit(Int_t branch,Float_t phys,Int_t *digits,
- Int_t *tracks,Int_t *hits,Float_t *charges){
+ Int_t *tracks,Int_t *hits,Float_t *charges,
+ Int_t sigexpanded){
// Add a simulated digit to the list.
TClonesArray &ldigits = *((TClonesArray*)fDigits->At(branch));
- AliITSCalibrationSDD *resp = 0;
switch(branch){
case 0:
new(ldigits[fNDigits[branch]++]) AliITSdigitSPD(digits,tracks,hits);
break;
case 1:
- resp = (AliITSCalibrationSDD*)GetCalibrationModel(
- GetITSgeom()->GetStartSDD());
new(ldigits[fNDigits[branch]++]) AliITSdigitSDD(phys,digits,tracks,
- hits,charges,resp);
+ hits,charges,sigexpanded);
break;
case 2:
new(ldigits[fNDigits[branch]++]) AliITSdigitSSD(digits,tracks,hits);
AliError("AliITSCalibration classes are not defined - nothing done");
return;
}
- AliCDBId idRespSPD("ITS/Calib/CalibSPD",firstRun, lastRun);
+ AliCDBId idRespSPD("ITS/Calib/SPDDead",firstRun, lastRun);
AliCDBId idRespSDD("ITS/Calib/CalibSDD",firstRun, lastRun);
AliCDBId idRespSSD("ITS/Calib/CalibSSD",firstRun, lastRun);
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff