#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"
-#include "AliITSPedestalSSD.h"
#include "AliITSsegmentationSPD.h"
#include "AliITSsegmentationSDD.h"
#include "AliITSsegmentationSSD.h"
}
if(fCalibration){
if(!(AliCDBManager::Instance()->GetCacheFlag())) {
- AliITSresponse* rspd = ((AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSPD()))->GetResponse();
- AliITSresponse* rssd = ((AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSSD()))->GetResponse();
- if(rspd) delete rspd;
- 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(dettype==1){
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);
SetDigitClassName(dettype,"AliITSdigitSDD");
SetClusterClassName(dettype,"AliITSRawClusterSDD");
// 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");
- // 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 *drSpSDD = AliCDBManager::Instance()->Get("ITS/Calib/DriftSpeedSDD");
AliCDBEntry *ddlMapSDD = AliCDBManager::Instance()->Get("ITS/Calib/DDLMapSDD");
- AliCDBEntry *mapASDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsAnodeSDD");
+// AliCDBEntry *mapASDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsAnodeSDD");
AliCDBEntry *mapTSDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsTimeSDD");
if(!entrySPD || !deadSPD || !entrySDD || !entryNoiseSSD || !entryGainSSD ||
- !entryPedestalSSD || !entryBadChannelsSSD ||
- !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapASDD || !mapTSDD ){
+ !entryBadChannelsSSD ||
+ !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapTSDD ){
AliFatal("Calibration object retrieval failed! ");
return kFALSE;
}
if(!cacheStatus)ddlMapSDD->SetObject(NULL);
ddlMapSDD->SetOwner(kTRUE);
- TObjArray *mapAn = (TObjArray *)mapASDD->GetObject();
- if(!cacheStatus)mapASDD->SetObject(NULL);
- mapASDD->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);
- AliITSNoiseSSD *noiseSSD = (AliITSNoiseSSD *)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);
- AliITSPedestalSSD *pedestalSSD =
- (AliITSPedestalSSD*)entryPedestalSSD->GetObject();
- if(!cacheStatus)entryPedestalSSD->SetObject(NULL);
- entryPedestalSSD->SetOwner(kTRUE);
-
- AliITSGainSSD *gainSSD = (AliITSGainSSD *)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);
- AliITSBadChannelsSSD *badchannelsSSD =
- (AliITSBadChannelsSSD*)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);
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 entryGainSSD;
delete entryBadChannelsSSD;
delete entry2SPD;
delete entry2SDD;
delete entry2SSD;
- delete mapASDD;
+ //delete mapASDD;
delete mapTSDD;
delete drSpSDD;
delete ddlMapSDD;
}
if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!caldeadSPD) ||(!calSDD) || (!drSp) || (!ddlsdd)
- || (!mapAn) || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badchannelsSSD)) {
+ || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badChannelsSSD)) {
AliWarning("Can not get calibration from calibration database !");
return kFALSE;
}
Int_t i0=2*i;
Int_t i1=1+2*i;
AliITSDriftSpeedArraySDD* arr0 = (AliITSDriftSpeedArraySDD*) drSp->At(i0);
- AliITSMapSDD* ma0 = (AliITSMapSDD*)mapAn->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* 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->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->SetPedestal(pedestalSSD);
fSSDCalibration->SetGain(gainSSD);
- fSSDCalibration->SetBadChannels(badchannelsSSD);
+ fSSDCalibration->SetBadChannels(badChannelsSSD);
//fSSDCalibration->FillBadChipMap();
}
+//______________________________________________________________________
+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