#include "AliCDBStorage.h"
#include "AliCDBEntry.h"
#include "AliCDBMetaData.h"
-
#include "AliITSdigit.h"
#include "AliITSdigitSPD.h"
#include "AliITSdigitSDD.h"
#include "AliITSdigitSSD.h"
+#include "AliITSgeom.h"
#include "AliITSDetTypeSim.h"
#include "AliITSpListItem.h"
-#include "AliITSresponseSDD.h"
+#include "AliITSCalibration.h"
#include "AliITSCalibrationSDD.h"
#include "AliITSMapSDD.h"
#include "AliITSDriftSpeedArraySDD.h"
#include "AliITSDriftSpeedSDD.h"
+#include "AliITSHLTforSDD.h"
#include "AliITSCalibrationSSD.h"
+#include "AliITSNoiseSSDv2.h"
+#include "AliITSGainSSDv2.h"
+#include "AliITSBadChannelsSSDv2.h"
#include "AliITSNoiseSSD.h"
#include "AliITSGainSSD.h"
#include "AliITSBadChannelsSSD.h"
#include "AliITSsimulationSPD.h"
#include "AliITSsimulationSDD.h"
#include "AliITSsimulationSSD.h"
-
+#include "AliITSDDLModuleMapSDD.h"
const Int_t AliITSDetTypeSim::fgkNdettypes = 3;
const Int_t AliITSDetTypeSim::fgkDefaultNModulesSPD = 240;
fSimulation(), // [NDet]
fSegmentation(), // [NDet]
fCalibration(), // [NMod]
-fPreProcess(), // [] e.g. Fill fHitModule with hits
-fPostProcess(), // [] e.g. Wright Raw data
+fSSDCalibration(0),
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.
+fkDigClassName(), // String with digit class name.
fLoader(0), // local pointer to loader
-fFirstcall(kTRUE){ // flag
+fFirstcall(kTRUE),
+fIsHLTmodeC(0){ // flag
// Default Constructor
// Inputs:
// none.
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();
+ fSSDCalibration=new AliITSCalibrationSSD();
fNMod[0] = fgkDefaultNModulesSPD;
fNMod[1] = fgkDefaultNModulesSDD;
fNMod[2] = fgkDefaultNModulesSSD;
}
fSegmentation = 0;
if(fCalibration && fRunNumber<0){
- 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;
+
fCalibration->Delete();
delete fCalibration;
}
fCalibration = 0;
- if(fPreProcess){
- fPreProcess->Delete();
- delete fPreProcess;
- }
- fPreProcess = 0;
- if(fPostProcess){
- fPostProcess->Delete();
- delete fPostProcess;
- }
- fPostProcess = 0;
+ if(fSSDCalibration) delete fSSDCalibration;
+ 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;
fSimulation(source.fSimulation), // [NDet]
fSegmentation(source.fSegmentation), // [NDet]
fCalibration(source.fCalibration), // [NMod]
-fPreProcess(source.fPreProcess), // [] e.g. Fill fHitModule with hits
-fPostProcess(source.fPostProcess), // [] e.g. Wright Raw data
+fSSDCalibration(source.fSSDCalibration),
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.
+fkDigClassName(), // String with digit class name.
fLoader(source.fLoader), // local pointer to loader
-fFirstcall(source.fFirstcall)
+fFirstcall(source.fFirstcall),
+fIsHLTmodeC(source.fIsHLTmodeC)
{
// Copy Constructor for object AliITSDetTypeSim not allowed
for(Int_t i=0;i<fgkNdettypes;i++){
- fDigClassName[i] = source.fDigClassName[i];
+ fkDigClassName[i] = source.fkDigClassName[i];
}
}
//----------------------------------------------------------------------
fSimulation->AddAt(sim,dettype);
}
//______________________________________________________________________
-AliITSsimulation* AliITSDetTypeSim::GetSimulationModel(Int_t dettype){
+AliITSsimulation* AliITSDetTypeSim::GetSimulationModel(Int_t dettype) const {
//Get simulation model for detector type
if(fSimulation==0) {
return (AliITSsimulation*)(fSimulation->At(dettype));
}
//______________________________________________________________________
-AliITSsimulation* AliITSDetTypeSim::GetSimulationModelByModule(Int_t module){
+AliITSsimulation* AliITSDetTypeSim::GetSimulationModelByModule(Int_t module) const {
//Get simulation model by module number
if(GetITSgeom()==0) {
if(idet==0){
seg = new AliITSsegmentationSPD();
}else if(idet==1){
- seg = new AliITSsegmentationSDD();
+ seg = new AliITSsegmentationSDD();
+ AliITSCalibrationSDD* cal=(AliITSCalibrationSDD*)GetCalibrationModel(fgkDefaultNModulesSPD+1);
+ if(cal->IsAMAt20MHz()){
+ seg->SetPadSize(seg->Dpz(0),20.);
+ seg->SetNPads(seg->Npz()/2,128);
+ }
}else {
seg = new AliITSsegmentationSSD();
}
fSegmentation->AddAt(seg,dettype);
}
//______________________________________________________________________
-AliITSsegmentation* AliITSDetTypeSim::GetSegmentationModel(Int_t dettype){
+AliITSsegmentation* AliITSDetTypeSim::GetSegmentationModel(Int_t dettype) const{
//Get segmentation model for detector type
if(fSegmentation==0) {
return (AliITSsegmentation*)(fSegmentation->At(dettype));
}
//_______________________________________________________________________
-AliITSsegmentation* AliITSDetTypeSim::GetSegmentationModelByModule(Int_t module){
+AliITSsegmentation* AliITSDetTypeSim::GetSegmentationModelByModule(Int_t module) const{
//Get segmentation model by module number
if(GetITSgeom()==0){
Warning("GetSegmentationModelByModule","GetITSgeom() is 0!");
void AliITSDetTypeSim::ResetCalibrationArray(){
//resets response array
if(fCalibration && fRunNumber<0){ // if fRunNumber<0 fCalibration is owner
+ /*
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;
+ */
fCalibration->Clear();
}else if (fCalibration && fRunNumber>=0){
fCalibration->Clear();
if(fSegmentation) fSegmentation->Clear();
}
//_______________________________________________________________________
-AliITSCalibration* AliITSDetTypeSim::GetCalibrationModel(Int_t iMod){
+AliITSCalibration* AliITSDetTypeSim::GetCalibrationModel(Int_t iMod) const {
//Get response model for module number iMod
if(fCalibration==0) {
AliError("fCalibration is 0!");
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;
+ }
+
}
//_______________________________________________________________________
void AliITSDetTypeSim::SetDefaults(){
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() {
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 *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);
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 || !drSpSDD || !ddlMapSDD || !mapASDD ||!mapTSDD){
+ !drSpSDD || !ddlMapSDD || !hltforSDD || !mapTSDD){
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);
entrySPD->SetOwner(kTRUE);
- AliITSresponseSPD *pSPD = (AliITSresponseSPD*)entry2SPD->GetObject();
- if(!isCacheActive)entry2SPD->SetObject(NULL);
- entry2SPD->SetOwner(kTRUE);
TObjArray *calSDD = (TObjArray *)entrySDD->GetObject();
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);
if(!isCacheActive)ddlMapSDD->SetObject(NULL);
ddlMapSDD->SetOwner(kTRUE);
- TObjArray *mapAn = (TObjArray *)mapASDD->GetObject();
- if(!isCacheActive)mapASDD->SetObject(NULL);
- mapASDD->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);
TObjArray *mapT = (TObjArray *)mapTSDD->GetObject();
if(!isCacheActive)mapTSDD->SetObject(NULL);
entrySSD->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(!isCacheActive)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(!isCacheActive)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(!isCacheActive)entryBadChannelsSSD->SetObject(NULL);
entryBadChannelsSSD->SetOwner(kTRUE);
- AliITSresponseSSD *pSSD = (AliITSresponseSSD*)entry2SSD->GetObject();
- if(!isCacheActive)entry2SSD->SetObject(NULL);
- entry2SSD->SetOwner(kTRUE);
-
+ /*AliITSNoiseSSDv2 *noiseSSD = (AliITSNoiseSSDv2 *)entryNoiseSSD->GetObject();
+ if(!isCacheActive)entryNoiseSSD->SetObject(NULL);
+ entryNoiseSSD->SetOwner(kTRUE);
+
+ AliITSGainSSDv2 *gainSSD = (AliITSGainSSDv2 *)entryGainSSD->GetObject();
+ if(!isCacheActive)entryGainSSD->SetObject(NULL);
+ entryGainSSD->SetOwner(kTRUE);
+
+ AliITSBadChannelsSSDv2 *badchannelsSSD =
+ (AliITSBadChannelsSSDv2 *)entryBadChannelsSSD->GetObject();
+ if(!isCacheActive)entryBadChannelsSSD->SetObject(NULL);
+ entryBadChannelsSSD->SetOwner(kTRUE);*/
+
// DB entries are deleted. In this way metadeta objects are deleted as well
if(!isCacheActive){
delete entrySPD;
delete entryNoiseSSD;
delete entryGainSSD;
delete entryBadChannelsSSD;
- delete entry2SPD;
- delete entry2SDD;
- delete entry2SSD;
- delete mapASDD;
+// delete mapASDD;
+ delete hltforSDD;
delete mapTSDD;
delete drSpSDD;
delete ddlMapSDD;
AliCDBManager::Instance()->SetCacheFlag(origCacheStatus);
- if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!calSDD) || (!drSp) || (!ddlsdd)
- || (!mapAn) || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badchannelsSSD)) {
+ if ((!calSPD) || (!calSDD) || (!drSp) || (!ddlsdd)
+ || (!hltsdd) || (!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;
for (Int_t i=0; i<fNMod[0]; i++) {
cal = (AliITSCalibration*) calSPD->At(i);
- cal->SetResponse(pSPD);
SetCalibrationModel(i, cal);
}
fDDLMapSDD->SetDDLMap(ddlsdd);
- 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;
+ fIsHLTmodeC=hltsdd->IsHLTmodeC();
+
+ 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->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((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* 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);
}
}
- for (Int_t i=0; i<fNMod[2]; i++) {
- AliITSCalibrationSSD *calibSSD = new AliITSCalibrationSSD();
- calibSSD->SetResponse((AliITSresponse*)pSSD);
-
- AliITSNoiseSSD *noise = (AliITSNoiseSSD*) (noiseSSD->At(i));
- calibSSD->SetNoise(noise);
- AliITSGainSSD *gain = (AliITSGainSSD*) (gainSSD->At(i));
- calibSSD->SetGain(gain);
- AliITSBadChannelsSSD *bad = (AliITSBadChannelsSSD*) (badchannelsSSD->At(i));
- calibSSD->SetBadChannels(bad);
- Int_t iMod = i + fgkDefaultNModulesSPD + fgkDefaultNModulesSDD;
- SetCalibrationModel(iMod, calibSSD);
+ fSSDCalibration->SetNoise(noiseSSD);
+ fSSDCalibration->SetGain(gainSSD);
+ fSSDCalibration->SetBadChannels(badChannelsSSD);
+ //fSSDCalibration->FillBadChipMap();
+
+
- }
return kTRUE;
}
//_______________________________________________________________________
}
}
//___________________________________________________________________
-void AliITSDetTypeSim::SetTreeAddressS(TTree* treeS, Char_t* name){
+void AliITSDetTypeSim::SetTreeAddressS(TTree* treeS, const Char_t* name){
// Set branch address for the ITS summable digits Trees.
char branchname[30];
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);
}
//___________________________________________________________________
-void AliITSDetTypeSim::SetTreeAddressD(TTree* treeD, Char_t* name){
+void AliITSDetTypeSim::SetTreeAddressD(TTree* treeD, const Char_t* name){
// Set branch address for the digit Trees.
const char *det[3] = {"SPD","SDD","SSD"};
fDigits = new TObjArray(fgkNdettypes);
}
for(Int_t i=0;i<fgkNdettypes;i++){
- Char_t* digclass = GetDigitClassName(i);
+ const Char_t* digclass = GetDigitClassName(i);
if(digclass==0x0){
if(i==0) SetDigitClassName(i,"AliITSdigitSPD");
if(i==1) SetDigitClassName(i,"AliITSdigitSDD");
}
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, const AliITSdigit* d){
// Add a simulated digit.
TClonesArray &ldigits = *((TClonesArray*)fDigits->At(branch));
}
//______________________________________________________________________
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);
}
}
//______________________________________________________________________
-void AliITSDetTypeSim::StoreCalibration(Int_t firstRun, Int_t lastRun,
- AliCDBMetaData &md) {
- // Store calibration in the calibration database
- // The database must be created in an external piece of code (i.e.
- // a configuration macro )
-
- if(!AliCDBManager::Instance()->IsDefaultStorageSet()) {
- AliWarning("No storage set! Will use dummy one");
- AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
- }
-
- if (!fCalibration) {
- AliError("AliITSCalibration classes are not defined - nothing done");
- return;
- }
- AliCDBId idRespSPD("ITS/Calib/SPDDead",firstRun, lastRun);
- AliCDBId idRespSDD("ITS/Calib/CalibSDD",firstRun, lastRun);
- AliCDBId idRespSSD("ITS/Calib/CalibSSD",firstRun, lastRun);
-
- TObjArray respSPD(fNMod[0]);
- TObjArray respSDD(fNMod[1]-fNMod[0]);
- TObjArray respSSD(fNMod[2]-fNMod[1]);
- respSPD.SetOwner(kFALSE);
- respSSD.SetOwner(kFALSE);
- respSSD.SetOwner(kFALSE);
-
- Int_t index[fgkNdettypes];
- for (Int_t i = 0; i<fgkNdettypes; i++ ) {
- index[i] = 0;
- for (Int_t j = 0; j<=i; j++ )
- index[i]+=fNMod[j];
- }
-
- for (Int_t i = 0; i<index[0]; i++ )
- respSPD.Add(fCalibration->At(i));
-
- for (Int_t i = index[0]; i<index[1]; i++ )
- respSDD.Add(fCalibration->At(i));
-
- for (Int_t i = index[1]; i<index[2]; i++ )
- respSSD.Add(fCalibration->At(i));
+void AliITSDetTypeSim::ReadOldSSDNoise(const 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 gNMod = array->GetEntries();
+ cout<<"Converting old calibration object for noise..."<<endl;
+
+ //NOISE
+ Double_t noise = 0.0;
+ for (Int_t iModule = 0; iModule < gNMod; 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
+}
- AliCDBManager::Instance()->Put(&respSPD, idRespSPD, &md);
- AliCDBManager::Instance()->Put(&respSDD, idRespSDD, &md);
- AliCDBManager::Instance()->Put(&respSSD, idRespSSD, &md);
+//______________________________________________________________________
+void AliITSDetTypeSim::ReadOldSSDBadChannels(const TObjArray *array,
+ AliITSBadChannelsSSDv2 *badChannelsSSD) {
+ //Reads the old SSD calibration object and converts it to the new format
+ Int_t nMod = array->GetEntries();
+ cout<<"Converting old calibration object for bad channels..."<<endl;
+ for (Int_t iModule = 0; iModule < nMod; 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 AliITSDetTypeSim::ReadOldSSDGain(const TObjArray *array,
+ AliITSGainSSDv2 *gainSSD) {
+ //Reads the old SSD calibration object and converts it to the new format
+
+ Int_t nMod = array->GetEntries();
+ cout<<"Converting old calibration object for gain..."<<endl;
+
+ //GAIN
+ for (Int_t iModule = 0; iModule < nMod; 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