#include "AliITSRawClusterSDD.h"
#include "AliITSRawClusterSSD.h"
#include "AliITSRecPoint.h"
+#include "AliITSReconstructor.h"
+#include "AliITSRecoParam.h"
#include "AliITSCalibrationSDD.h"
#include "AliITSMapSDD.h"
#include "AliITSDriftSpeedArraySDD.h"
+#include "AliITSDriftSpeedSDD.h"
#include "AliITSCalibrationSSD.h"
#include "AliITSNoiseSSD.h"
#include "AliITSGainSSD.h"
fReconstruction(0),
fSegmentation(0),
fCalibration(0),
+fSSDCalibration(0),
+fSPDDead(0),
fPreProcess(0),
fPostProcess(0),
fDigits(0),
fDDLMapSDD(0),
+fRespSDD(0),
fNdtype(0),
fCtype(0),
fNctype(0),
fDigClassName[i]=0;
fRecPointClassName[i]=0;
}
- fDDLMapSDD=new AliITSDDLModuleMapSDD();
+ fSSDCalibration=new AliITSCalibrationSSD();
fNdtype = new Int_t[fgkNdettypes];
fCtype = new TObjArray(fgkNdettypes);
fNctype = new Int_t[fgkNdettypes];
fReconstruction(rec.fReconstruction),
fSegmentation(rec.fSegmentation),
fCalibration(rec.fCalibration),
+fSSDCalibration(rec.fSSDCalibration),
+fSPDDead(rec.fSPDDead),
fPreProcess(rec.fPreProcess),
fPostProcess(rec.fPostProcess),
fDigits(rec.fDigits),
fDDLMapSDD(rec.fDDLMapSDD),
+fRespSDD(rec.fRespSDD),
fNdtype(rec.fNdtype),
fCtype(rec.fCtype),
fNctype(rec.fNctype),
}
if(fCalibration){
if(!(AliCDBManager::Instance()->GetCacheFlag())) {
- AliITSresponse* rspd = ((AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSPD()))->GetResponse();
- AliITSresponse* rsdd = ((AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSDD()))->GetResponse();
- AliITSresponse* rssd = ((AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSSD()))->GetResponse();
- if(rspd) delete rspd;
- if(rsdd) delete rsdd;
- if(rssd) delete rssd;
+ AliITSCalibration * calSPD = (AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSPD());
+ if (calSPD) {
+ AliITSresponse* rspd = calSPD->GetResponse();
+ if(rspd) delete rspd;
+ }
+
+ AliITSCalibration * calSSD = (AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSSD());
+ if (calSSD) {
+ AliITSresponse* rssd = calSSD->GetResponse();
+ if(rssd) delete rssd;
+ }
fCalibration->Delete();
delete fCalibration;
fCalibration = 0;
- }
+ if(fRespSDD) delete fRespSDD;
+ if(fDDLMapSDD) delete fDDLMapSDD;
+ }
}
+ if(fSSDCalibration) delete fSSDCalibration;
+ if(fSPDDead){
+ if(!(AliCDBManager::Instance()->GetCacheFlag())) {
+ fSPDDead->Delete();
+ delete fSPDDead;
+ fSPDDead = 0;
+ }
+ }
if(fPreProcess) delete fPreProcess;
if(fPostProcess) delete fPostProcess;
- if(fDDLMapSDD) delete fDDLMapSDD;
if(fDigits){
fDigits->Delete();
delete fDigits;
}
//_______________________________________________________________________
+void AliITSDetTypeRec::SetSPDDeadModel(Int_t iMod, AliITSCalibration *cal){
+
+ //Set dead pixel info for the SPD module iMod
+ if (fSPDDead==0) {
+ fSPDDead = new TObjArray(fgkDefaultNModulesSPD);
+ fSPDDead->SetOwner(kTRUE);
+ fSPDDead->Clear();
+ }
+
+ if (fSPDDead->At(iMod) != 0)
+ delete (AliITSCalibration*) fSPDDead->At(iMod);
+ fSPDDead->AddAt(cal,iMod);
+}
+//_______________________________________________________________________
AliITSCalibration* AliITSDetTypeRec::GetCalibrationModel(Int_t iMod){
//Get calibration model for module type
return 0;
}
- return (AliITSCalibration*)fCalibration->At(iMod);
+ if(iMod<fgkDefaultNModulesSPD+fgkDefaultNModulesSDD){
+ return (AliITSCalibration*)fCalibration->At(iMod);
+ }else{
+ Int_t i=iMod-(fgkDefaultNModulesSPD+fgkDefaultNModulesSDD);
+ fSSDCalibration->SetModule(i);
+ return (AliITSCalibration*)fSSDCalibration;
+ }
+
+}
+//_______________________________________________________________________
+AliITSCalibration* AliITSDetTypeRec::GetSPDDeadModel(Int_t iMod){
+
+ //Get SPD dead for module iMod
+
+ if(fSPDDead==0) {
+ AliWarning("fSPDDead is 0!");
+ return 0;
+ }
+
+ return (AliITSCalibration*)fSPDDead->At(iMod);
}
//______________________________________________________________________
}
if(dettype==1){
- AliITSCalibrationSDD* res=(AliITSCalibrationSDD*) GetCalibrationModel(GetITSgeom()->GetStartSDD());
seg = new AliITSsegmentationSDD();
SetSegmentationModel(dettype,seg);
- const char *kopt = ((AliITSresponseSDD*)res->GetResponse())->ZeroSuppOption();
- if((!strstr(kopt,"2D"))&&(!strstr(kopt,"1D"))) SetDigitClassName(dettype,"AliITSdigit");
- else SetDigitClassName(dettype,"AliITSdigitSDD");
+ SetDigitClassName(dettype,"AliITSdigitSDD");
SetClusterClassName(dettype,"AliITSRawClusterSDD");
-
}
if(dettype==2){
AliITSsegmentationSSD* seg2 = new AliITSsegmentationSSD();
- seg2->SetAngles(0.0075,0.0275); // strip angels rad P and N side.
- seg2->SetAnglesLay5(0.0075,0.0275); // strip angels rad P and N side.
- seg2->SetAnglesLay6(0.0275,0.0075); // strip angels rad P and N side.
SetSegmentationModel(dettype,seg2);
SetDigitClassName(dettype,"AliITSdigitSSD");
SetClusterClassName(dettype,"AliITSRawClusterSSD");
fCalibration->Clear();
}
- AliCDBEntry *entrySPD = AliCDBManager::Instance()->Get("ITS/Calib/SPDDead");
+ // dead pixel are not used for local reconstruction
+ AliCDBEntry *entrySPD = AliCDBManager::Instance()->Get("ITS/Calib/SPDNoisy");
+ AliCDBEntry *deadSPD = AliCDBManager::Instance()->Get("ITS/Calib/SPDDead");
AliCDBEntry *entrySDD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSDD");
// AliCDBEntry *entrySSD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSSD");
- AliCDBEntry *entryNoiseSSD = AliCDBManager::Instance()->Get("ITS/Calib/NoiseSSD");
- AliCDBEntry *entryPedestalSSD = AliCDBManager::Instance()->Get("ITS/Calib/PedestalSSD");
- 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 *entryPedestalSSD = AliCDBManager::Instance()->Get("ITS/Calib/PedestalSSD");
+ AliCDBEntry *entryGainSSD = AliCDBManager::Instance()->Get("ITS/Calib/GainSSD");
+ AliCDBEntry *entryBadChannelsSSD = AliCDBManager::Instance()->Get("ITS/Calib/BadChannelsSSD");
+ // Entry for the AliITSRecoParam object
+ AliCDBEntry *entryRP = AliCDBManager::Instance()->Get("ITS/Calib/RecoParam/");
AliCDBEntry *entry2SPD = AliCDBManager::Instance()->Get("ITS/Calib/RespSPD");
AliCDBEntry *entry2SDD = AliCDBManager::Instance()->Get("ITS/Calib/RespSDD");
AliCDBEntry *entry2SSD = AliCDBManager::Instance()->Get("ITS/Calib/RespSSD");
AliCDBEntry *mapASDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsAnodeSDD");
AliCDBEntry *mapTSDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsTimeSDD");
- if(!entrySPD || !entrySDD || !entryNoiseSSD || !entryGainSSD ||
+ if(!entrySPD || !deadSPD || !entrySDD || !entryNoiseSSD || !entryGainSSD ||
!entryPedestalSSD || !entryBadChannelsSSD ||
- !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapASDD || !mapTSDD){
+ !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapASDD || !mapTSDD ){
AliFatal("Calibration object retrieval failed! ");
return kFALSE;
}
if(!cacheStatus)entrySPD->SetObject(NULL);
entrySPD->SetOwner(kTRUE);
+ TObjArray *caldeadSPD = (TObjArray *)deadSPD->GetObject();
+ if(!cacheStatus)deadSPD->SetObject(NULL);
+ deadSPD->SetOwner(kTRUE);
+
AliITSresponseSPD *pSPD = (AliITSresponseSPD*)entry2SPD->GetObject();
if(!cacheStatus)entry2SPD->SetObject(NULL);
entry2SPD->SetOwner(kTRUE);
if(!cacheStatus)mapTSDD->SetObject(NULL);
mapTSDD->SetOwner(kTRUE);
- TObjArray *noiseSSD = (TObjArray *)entryNoiseSSD->GetObject();
+ AliITSNoiseSSD *noiseSSD = (AliITSNoiseSSD *)entryNoiseSSD->GetObject();
if(!cacheStatus)entryNoiseSSD->SetObject(NULL);
entryNoiseSSD->SetOwner(kTRUE);
- TObjArray *pedestalSSD = (TObjArray *)entryPedestalSSD->GetObject();
+ AliITSPedestalSSD *pedestalSSD =
+ (AliITSPedestalSSD*)entryPedestalSSD->GetObject();
if(!cacheStatus)entryPedestalSSD->SetObject(NULL);
entryPedestalSSD->SetOwner(kTRUE);
- TObjArray *gainSSD = (TObjArray *)entryGainSSD->GetObject();
+ AliITSGainSSD *gainSSD = (AliITSGainSSD *)entryGainSSD->GetObject();
if(!cacheStatus)entryGainSSD->SetObject(NULL);
entryGainSSD->SetOwner(kTRUE);
- TObjArray *badchannelsSSD = (TObjArray *)entryBadChannelsSSD->GetObject();
+ AliITSBadChannelsSSD *badchannelsSSD =
+ (AliITSBadChannelsSSD*)entryBadChannelsSSD->GetObject();
if(!cacheStatus)entryBadChannelsSSD->SetObject(NULL);
entryBadChannelsSSD->SetOwner(kTRUE);
if(!cacheStatus)entry2SSD->SetObject(NULL);
entry2SSD->SetOwner(kTRUE);
+ if(!AliITSReconstructor::GetRecoParam()){
+ if(!entryRP) AliFatal("Calibration object (RecoParam) retrieval from OCDB failed! Hint: as an alternative you can set it in your reconstruction macro ");
+ AliITSRecoParam *rp = (AliITSRecoParam*)entryRP->GetObject();
+ if(!cacheStatus)entryRP->SetObject(NULL);
+ entryRP->SetOwner(kTRUE);
+ AliITSReconstructor::SetRecoParam(rp);
+ }
+ else {
+ AliWarning("AliITSRecoParam object has been already set in AliITSReconstructor. The OCDB instance will not be used\n");
+ }
+
+
// DB entries are deleted. In this way metadeta objects are deleted as well
if(!cacheStatus){
delete entrySPD;
+ delete deadSPD;
delete entrySDD;
delete entryNoiseSSD;
delete entryPedestalSSD;
delete ddlMapSDD;
}
- if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!calSDD) || (!drSp) || (!ddlsdd)
+ if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!caldeadSPD) ||(!calSDD) || (!drSp) || (!ddlsdd)
|| (!mapAn) || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badchannelsSSD)) {
AliWarning("Can not get calibration from calibration database !");
return kFALSE;
fNMod[0] = calSPD->GetEntries();
fNMod[1] = calSDD->GetEntries();
- fNMod[2] = noiseSSD->GetEntries();
+ //fNMod[2] = noiseSSD->GetEntries();
AliInfo(Form("%i SPD, %i SDD and %i SSD in calibration database",
fNMod[0], fNMod[1], fNMod[2]));
AliITSCalibration* cal;
cal = (AliITSCalibration*) calSPD->At(i);
cal->SetResponse((AliITSresponse*)pSPD);
SetCalibrationModel(i, cal);
+ cal = (AliITSCalibration*) caldeadSPD->At(i);
+ SetSPDDeadModel(i, cal);
+ }
+
+ fDDLMapSDD=ddlsdd;
+ fRespSDD=pSDD;
+ for(Int_t iddl=0; iddl<AliITSDDLModuleMapSDD::GetNDDLs(); iddl++){
+ for(Int_t icar=0; icar<AliITSDDLModuleMapSDD::GetNModPerDDL();icar++){
+ Int_t iMod=fDDLMapSDD->GetModuleNumber(iddl,icar);
+ if(iMod==-1) continue;
+ Int_t i=iMod - fgkDefaultNModulesSPD;
+ cal = (AliITSCalibration*) calSDD->At(i);
+ 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[1]; i++) {
- cal = (AliITSCalibration*) calSDD->At(i);
- cal->SetResponse((AliITSresponse*)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);
- fDDLMapSDD->SetDDLMap(ddlsdd);
- Int_t iMod = i + fNMod[0];
- SetCalibrationModel(iMod, cal);
- }
+
+ fSSDCalibration->SetResponse((AliITSresponse*)pSSD);
+ fSSDCalibration->SetNoise(noiseSSD);
+ fSSDCalibration->SetPedestal(pedestalSSD);
+ fSSDCalibration->SetGain(gainSSD);
+ fSSDCalibration->SetBadChannels(badchannelsSSD);
+ //fSSDCalibration->FillBadChipMap();
+
+
+ /*
for (Int_t i=0; i<fNMod[2]; i++) {
AliITSCalibrationSSD *calibSSD = new AliITSCalibrationSSD();
calibSSD->SetGain(gain);
AliITSBadChannelsSSD *bad = (AliITSBadChannelsSSD*) (badchannelsSSD->At(i));
calibSSD->SetBadChannels(bad);
+ calibSSD->FillBadChipMap();
- Int_t iMod = i + fNMod[0] + fNMod[1];
+ Int_t iMod = i + fgkDefaultNModulesSPD + fgkDefaultNModulesSDD;
SetCalibrationModel(iMod, calibSSD);
}
+ */
return kTRUE;
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff