#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 "AliITSNoiseSSDv2.h"
+#include "AliITSGainSSDv2.h"
+#include "AliITSBadChannelsSSDv2.h"
#include "AliITSNoiseSSD.h"
#include "AliITSGainSSD.h"
#include "AliITSBadChannelsSSD.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;
}
+ 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(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);
}
//______________________________________________________________________
for(Int_t dettype=0;dettype<fgkNdettypes;dettype++){
if(dettype==0){
- seg = new AliITSsegmentationSPD(GetITSgeom());
+ seg = new AliITSsegmentationSPD();
SetSegmentationModel(dettype,seg);
SetDigitClassName(dettype,"AliITSdigitSPD");
SetClusterClassName(dettype,"AliITSRawClusterSPD");
}
if(dettype==1){
- AliITSCalibrationSDD* res=(AliITSCalibrationSDD*) GetCalibrationModel(GetITSgeom()->GetStartSDD());
- seg = new AliITSsegmentationSDD(GetITSgeom());
+ seg = new AliITSsegmentationSDD();
+ AliITSCalibrationSDD* cal=(AliITSCalibrationSDD*)GetCalibrationModel(fgkDefaultNModulesSPD+1);
+ if(cal->IsAMAt20MHz()){
+ seg->SetPadSize(seg->Dpz(0),20.);
+ seg->SetNPads(seg->Npz()/2,128);
+ }
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(GetITSgeom());
- 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.
+ AliITSsegmentationSSD* seg2 = new AliITSsegmentationSSD();
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 *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");
AliCDBEntry *entry2SDD = AliCDBManager::Instance()->Get("ITS/Calib/RespSDD");
AliCDBEntry *entry2SSD = AliCDBManager::Instance()->Get("ITS/Calib/RespSSD");
AliCDBEntry *drSpSDD = AliCDBManager::Instance()->Get("ITS/Calib/DriftSpeedSDD");
- AliCDBEntry *mapASDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsAnodeSDD");
+ AliCDBEntry *ddlMapSDD = AliCDBManager::Instance()->Get("ITS/Calib/DDLMapSDD");
+// AliCDBEntry *mapASDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsAnodeSDD");
AliCDBEntry *mapTSDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsTimeSDD");
- if(!entrySPD || !entrySDD || !entryNoiseSSD || !entryGainSSD || !entryBadChannelsSSD ||
- !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !mapASDD || !mapTSDD){
+ if(!entrySPD || !deadSPD || !entrySDD || !entryNoiseSSD || !entryGainSSD ||
+ !entryBadChannelsSSD ||
+ !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !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)drSpSDD->SetObject(NULL);
drSpSDD->SetOwner(kTRUE);
- TObjArray *mapAn = (TObjArray *)mapASDD->GetObject();
- if(!cacheStatus)mapASDD->SetObject(NULL);
- mapASDD->SetOwner(kTRUE);
+ AliITSDDLModuleMapSDD *ddlsdd=(AliITSDDLModuleMapSDD*)ddlMapSDD->GetObject();
+ if(!cacheStatus)ddlMapSDD->SetObject(NULL);
+ ddlMapSDD->SetOwner(kTRUE);
+
+// TObjArray *mapAn = (TObjArray *)mapASDD->GetObject();
+// if(!cacheStatus)mapASDD->SetObject(NULL);
+// mapASDD->SetOwner(kTRUE);
TObjArray *mapT = (TObjArray *)mapTSDD->GetObject();
if(!cacheStatus)mapTSDD->SetObject(NULL);
mapTSDD->SetOwner(kTRUE);
- TObjArray *noiseSSD = (TObjArray *)entryNoiseSSD->GetObject();
+ TObject *emptyssd = 0; TString ssdobjectname = 0;
+ AliITSNoiseSSDv2 *noiseSSD = new AliITSNoiseSSDv2();
+ emptyssd = (TObject *)entryNoiseSSD->GetObject();
+ ssdobjectname = emptyssd->GetName();
+ if(ssdobjectname=="TObjArray") {
+ TObjArray *noiseSSDOld = (TObjArray *)entryNoiseSSD->GetObject();
+ ReadOldSSDNoise(noiseSSDOld, noiseSSD);
+ }
+ else if(ssdobjectname=="AliITSNoiseSSDv2")
+ noiseSSD = (AliITSNoiseSSDv2 *)entryNoiseSSD->GetObject();
if(!cacheStatus)entryNoiseSSD->SetObject(NULL);
entryNoiseSSD->SetOwner(kTRUE);
- TObjArray *gainSSD = (TObjArray *)entryGainSSD->GetObject();
+ AliITSGainSSDv2 *gainSSD = new AliITSGainSSDv2();
+ emptyssd = (TObject *)entryGainSSD->GetObject();
+ ssdobjectname = emptyssd->GetName();
+ if(ssdobjectname=="Gain") {
+ TObjArray *gainSSDOld = (TObjArray *)entryGainSSD->GetObject();
+ ReadOldSSDGain(gainSSDOld, gainSSD);
+ }
+ else if(ssdobjectname=="AliITSGainSSDv2")
+ gainSSD = (AliITSGainSSDv2 *)entryGainSSD->GetObject();
if(!cacheStatus)entryGainSSD->SetObject(NULL);
entryGainSSD->SetOwner(kTRUE);
- TObjArray *badchannelsSSD = (TObjArray *)entryBadChannelsSSD->GetObject();
+ AliITSBadChannelsSSDv2 *badChannelsSSD = new AliITSBadChannelsSSDv2();
+ emptyssd = (TObject *)entryBadChannelsSSD->GetObject();
+ ssdobjectname = emptyssd->GetName();
+ if(ssdobjectname=="TObjArray") {
+ TObjArray *badChannelsSSDOld = (TObjArray *)entryBadChannelsSSD->GetObject();
+ ReadOldSSDBadChannels(badChannelsSSDOld, badChannelsSSD);
+ }
+ else if(ssdobjectname=="AliITSBadChannelsSSDv2")
+ badChannelsSSD = (AliITSBadChannelsSSDv2*)entryBadChannelsSSD->GetObject();
if(!cacheStatus)entryBadChannelsSSD->SetObject(NULL);
entryBadChannelsSSD->SetOwner(kTRUE);
// DB entries are deleted. In this way metadeta objects are deleted as well
if(!cacheStatus){
delete entrySPD;
+ delete deadSPD;
delete entrySDD;
delete entryNoiseSSD;
delete entryGainSSD;
delete entry2SPD;
delete entry2SDD;
delete entry2SSD;
- delete mapASDD;
+ //delete mapASDD;
delete mapTSDD;
delete drSpSDD;
+ delete ddlMapSDD;
}
- if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!calSDD) || (!drSp)
- || (!mapAn) || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badchannelsSSD)) {
+ if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!caldeadSPD) ||(!calSDD) || (!drSp) || (!ddlsdd)
+ || (!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);
}
- 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);
- Int_t iMod = i + fNMod[0];
- SetCalibrationModel(iMod, 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);
+ }
}
+
+ fSSDCalibration->SetResponse((AliITSresponse*)pSSD);
+ fSSDCalibration->SetNoise(noiseSSD);
+ fSSDCalibration->SetGain(gainSSD);
+ fSSDCalibration->SetBadChannels(badChannelsSSD);
+ //fSSDCalibration->FillBadChipMap();
+
+
+ /*
for (Int_t i=0; i<fNMod[2]; i++) {
AliITSCalibrationSSD *calibSSD = new AliITSCalibrationSSD();
AliITSNoiseSSD *noise = (AliITSNoiseSSD*) (noiseSSD->At(i));
calibSSD->SetNoise(noise);
+ AliITSPedestalSSD *pedestal = (AliITSPedestalSSD*) (pedestalSSD->At(i));
+ calibSSD->SetPedestal(pedestal);
AliITSGainSSD *gain = (AliITSGainSSD*) (gainSSD->At(i));
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;
}
}
+//______________________________________________________________________
+void AliITSDetTypeRec::ReadOldSSDNoise(TObjArray *array,
+ AliITSNoiseSSDv2 *noiseSSD) {
+ //Reads the old SSD calibration object and converts it to the new format
+ const Int_t fgkSSDSTRIPSPERMODULE = 1536;
+ const Int_t fgkSSDPSIDESTRIPSPERMODULE = 768;
+
+ Int_t fNMod = array->GetEntries();
+ cout<<"Converting old calibration object for noise..."<<endl;
+
+ //NOISE
+ Double_t noise = 0.0;
+ for (Int_t iModule = 0; iModule < fNMod; iModule++) {
+ AliITSNoiseSSD *noiseModule = (AliITSNoiseSSD*) (array->At(iModule));
+ for(Int_t iStrip = 0; iStrip < fgkSSDSTRIPSPERMODULE; iStrip++) {
+ noise = (iStrip < fgkSSDPSIDESTRIPSPERMODULE) ? noiseModule->GetNoiseP(iStrip) : noiseModule->GetNoiseN(1535 - iStrip);
+ if(iStrip < fgkSSDPSIDESTRIPSPERMODULE)
+ noiseSSD->AddNoiseP(iModule,iStrip,noise);
+ if(iStrip >= fgkSSDPSIDESTRIPSPERMODULE)
+ noiseSSD->AddNoiseN(iModule,1535 - iStrip,noise);
+ }//loop over strips
+ }//loop over modules
+}
+
+//______________________________________________________________________
+void AliITSDetTypeRec::ReadOldSSDBadChannels(TObjArray *array,
+ AliITSBadChannelsSSDv2 *badChannelsSSD) {
+ //Reads the old SSD calibration object and converts it to the new format
+ Int_t fNMod = array->GetEntries();
+ cout<<"Converting old calibration object for bad channels..."<<endl;
+ for (Int_t iModule = 0; iModule < fNMod; iModule++) {
+ //for (Int_t iModule = 0; iModule < 1; iModule++) {
+ AliITSBadChannelsSSD *bad = (AliITSBadChannelsSSD*) (array->At(iModule));
+ TArrayI arrayPSide = bad->GetBadPChannelsList();
+ for(Int_t iPCounter = 0; iPCounter < arrayPSide.GetSize(); iPCounter++)
+ badChannelsSSD->AddBadChannelP(iModule,
+ iPCounter,
+ (Char_t)arrayPSide.At(iPCounter));
+
+ TArrayI arrayNSide = bad->GetBadNChannelsList();
+ for(Int_t iNCounter = 0; iNCounter < arrayNSide.GetSize(); iNCounter++)
+ badChannelsSSD->AddBadChannelN(iModule,
+ iNCounter,
+ (Char_t)arrayNSide.At(iNCounter));
+
+ }//loop over modules
+}
+
+//______________________________________________________________________
+void AliITSDetTypeRec::ReadOldSSDGain(TObjArray *array,
+ AliITSGainSSDv2 *gainSSD) {
+ //Reads the old SSD calibration object and converts it to the new format
+
+ Int_t fNMod = array->GetEntries();
+ cout<<"Converting old calibration object for gain..."<<endl;
+
+ //GAIN
+ for (Int_t iModule = 0; iModule < fNMod; iModule++) {
+ AliITSGainSSD *gainModule = (AliITSGainSSD*) (array->At(iModule));
+ TArrayF arrayPSide = gainModule->GetGainP();
+ for(Int_t iPCounter = 0; iPCounter < arrayPSide.GetSize(); iPCounter++)
+ gainSSD->AddGainP(iModule,
+ iPCounter,
+ arrayPSide.At(iPCounter));
+ TArrayF arrayNSide = gainModule->GetGainN();
+ for(Int_t iNCounter = 0; iNCounter < arrayNSide.GetSize(); iNCounter++)
+ gainSSD->AddGainN(iModule,
+ iNCounter,
+ arrayNSide.At(iNCounter));
+ }//loop over modules
+}
+
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff