}
//____________________________________________________________________________
-AliEMCAL::AliEMCAL(const char* name, const char* title)
+AliEMCAL::AliEMCAL(const char* name, const char* title,
+ const Bool_t checkGeoAndRun)
: AliDetector(name,title),
fBirkC0(0),
fBirkC1(0.),
fBirkC2(0.),
fGeometry(0),
- fCheckRunNumberAndGeoVersion(kTRUE),
+ fCheckRunNumberAndGeoVersion(checkGeoAndRun),
fTriggerData(0x0)
{
// ctor : title is used to identify the layout
//dtor
delete fgRawUtils;
delete fTriggerData;
-
- AliLoader *emcalLoader=0;
- if ((emcalLoader = AliRunLoader::Instance()->GetDetectorLoader("EMCAL")))
- emcalLoader->CleanSDigitizer();
-
-
}
//____________________________________________________________________________
// }
//____________________________________________________________________________
-AliDigitizer* AliEMCAL::CreateDigitizer(AliRunDigitizer* manager) const
+AliDigitizer* AliEMCAL::CreateDigitizer(AliDigitizationInput* digInput) const
{
//create and return the digitizer
- return new AliEMCALDigitizer(manager);
+ return new AliEMCALDigitizer(digInput);
}
//____________________________________________________________________________
GetGeometry();
AliEMCALSDigitizer emcalDigitizer(fLoader->GetRunLoader()->GetFileName().Data()) ;
emcalDigitizer.SetEventRange(0, -1) ; // do all the events
- emcalDigitizer.ExecuteTask() ;
+ emcalDigitizer.Digitize() ;
}
//______________________________________________________________________
//Trigger sdigits
if(!fTriggerData)fTriggerData = new AliEMCALTriggerData();
fTriggerData->SetMode(1);
- TClonesArray *digitsTrg = new TClonesArray("AliEMCALTriggerRawDigit", 32 * 96);
+ const Int_t nTRU = GetGeometry()->GetNTotalTRU();
+ TClonesArray *digitsTrg = new TClonesArray("AliEMCALTriggerRawDigit", nTRU * 96);
Int_t bufsize = 32000;
treeS->Branch("EMTRG", &digitsTrg, bufsize);
{
//Initializes and returns geometry
+ // Pass the transpor model name (Geant3, Geant4, Fluka) and title to the geometry
+ TString mcname = "";
+ TString mctitle = "";
+ if(gMC){
+ mcname = gMC->GetName() ;
+ mctitle = gMC->GetTitle() ;
+ }
+
+ TString geoName(GetTitle());
+
//Check if run number and requested geometry correspond to the same geometry as
//in real data taking. To prevent errors in official simulation productions
if(!(AliEMCALGeometry::GetInstance()))
{
+ // Check the transport model name and option, set sampling fraction depending on it
if(!fCheckRunNumberAndGeoVersion){// Set geometry with the name used in the configuration file
- return AliEMCALGeometry::GetInstance(GetTitle(),"EMCAL") ;
+ AliInfo(Form("Geometry name in use <<%s>>, requested via Config file", geoName.Data()));
+ return AliEMCALGeometry::GetInstance(GetTitle(),"EMCAL",mcname,mctitle) ;
}
- else{//Check run number and version and set the corresponding one.
+ else
+ {//Check run number and version and set the corresponding one.
//Get run number
//AliRunLoader *rl = AliRunLoader::Instance();
//Int_t runNumber = rl->GetRunNumber();
Int_t runNumber = man->GetRun();
//Instanciate geometry depending on the run number
- TString geoName(GetTitle());
- if(runNumber > 104064 && runNumber <= 140000 ){//2009-2010 runs
+ if(runNumber >= 104064 && runNumber < 140000 ){//2009-2010 runs
//First year geometry, 4 SM.
- if(!geoName.Contains("FIRSTYEARV1")){
+ if(!geoName.Contains("FIRSTYEARV1"))
+ {
AliInfo(Form("*** ATTENTION *** \n \t Specified geometry name <<%s>> for run %d is not considered! \n \t In use <<EMCAL_FIRSTYEARV1>>, check run number and year \n ",
- geoName.Data(),runNumber)); }
- else {
- AliDebug(1,"Initialized geometry with name <<EMCAL_FIRSTYEARV1>>");}
-
- return AliEMCALGeometry::GetInstance("EMCAL_FIRSTYEARV1","EMCAL") ;// Set geometry with the name used in the configuration file
+ geoName.Data(),runNumber));
+ }
+ else
+ {
+ AliDebug(1,"Initialized geometry with name <<EMCAL_FIRSTYEARV1>>");
+ }
+
+ return AliEMCALGeometry::GetInstance("EMCAL_FIRSTYEARV1","EMCAL",mcname,mctitle) ;// Set geometry with the name used in the configuration file
}
- else{ //Default geometry
- //Complete EMCAL geometry, 10 SM.
-
- if(!geoName.Contains("COMPLETEV1")){
+ else if(runNumber >= 140000 && runNumber <= 170593)
+ {
+ //Almost complete EMCAL geometry, 10 SM. Year 2011 configuration
+
+ if(!geoName.Contains("COMPLETEV1"))
+ {
AliInfo(Form("*** ATTENTION *** \n \t Specified geometry name <<%s>> for run %d is not considered! \n \t In use <<EMCAL_COMPLETEV1>>, check run number and year \n ",
- geoName.Data(),runNumber));}
- else {
- AliDebug(1,"Initialized geometry with name <<EMCAL_COMPLETEV1>>");}
+ geoName.Data(),runNumber));
+ }
+ else
+ {
+ AliDebug(1,"Initialized geometry with name <<EMCAL_COMPLETEV1>>");
+ }
+
+ return AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1","EMCAL",mcname,mctitle) ;// Set geometry with the name used in the configuration file
+ }
+ else if(runNumber > 176000 && runNumber <= 197692)
+ {
+ //Complete EMCAL geometry, 12 SM. Year 2012 and on
+ if(!geoName.Contains("COMPLETE12SMV1"))
+ {
+ AliInfo(Form("*** ATTENTION *** \n \t Specified geometry name <<%s>> for run %d is not considered! \n \t In use <<EMCAL_COMPLETE12SMV1>>, check run number and year \n ", geoName.Data(),runNumber));
+ } else {
+ AliDebug(1,"Initialized geometry with name <<EMCAL_COMPLETE12SMV1>>");
+ }
+
+ return AliEMCALGeometry::GetInstance("EMCAL_COMPLETE12SMV1","EMCAL",mcname,mctitle) ;// Set geometry with the name used in the configuration file
- return AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1","EMCAL") ;// Set geometry with the name used in the configuration file
+ }
+ else
+ {
+ //EMCAL + DCAL geometry, 20 SM. Year 2014 and on
+
+ if(geoName.Contains("DCAL_DEV"))
+ {
+ AliInfo("*** ATTENTION *** \n \t Set geometry name <<EMCAL_COMPLETE12SMV1_DCAL_DEV>> \n ");
+ return AliEMCALGeometry::GetInstance("EMCAL_COMPLETE12SMV1_DCAL_DEV","EMCAL",mcname,mctitle) ;
+ }
+ else if(geoName.Contains("DCAL_8SM"))
+ {
+ AliInfo("*** ATTENTION *** \n \t Set geometry name <<EMCAL_COMPLETE12SMV1_DCAL_8SM>> \n ");
+ return AliEMCALGeometry::GetInstance("EMCAL_COMPLETE12SMV1_DCAL_8SM","EMCAL",mcname,mctitle) ;
+ }
+
+ if(!geoName.Contains("COMPLETE12SMV1"))
+ {
+ AliInfo(Form("*** ATTENTION *** \n \t Specified geometry name <<%s>> for run %d is not considered! \n \t In use <<EMCAL_COMPLETE12SMV1>>, check run number and year \n ", geoName.Data(),runNumber));
+ }
+ else
+ {
+ AliDebug(1,"Initialized geometry with name <<EMCAL_COMPLETE12SMV1>>");
+ }
+
+ return AliEMCALGeometry::GetInstance("EMCAL_COMPLETE12SMV1_DCAL","EMCAL",mcname,mctitle) ;// Set geometry with the name used in the configuration file
}
}
}// Init geometry for the first time
+
return AliEMCALGeometry::GetInstance();
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff