Be sure to load mapping when needed

[u/mrichter/AliRoot.git] / EMCAL / MakeEMCALFullMisAlignment.C

diff --git a/EMCAL/MakeEMCALFullMisAlignment.C b/EMCAL/MakeEMCALFullMisAlignment.C
index 2796e392f929cf399b89c0636d3675df3290e8de..8689aaccf17451585155112888302185ae125d0b 100644 (file)
--- a/EMCAL/MakeEMCALFullMisAlignment.C
+++ b/EMCAL/MakeEMCALFullMisAlignment.C
@@ -1,8 +1,11 @@
-void MakeEMCALFullMisAlignment(){
+enum SurveyDataType_t { kSurvey = 0, kDummy = 1};
+
+void MakeEMCALFullMisAlignment(TString geoname = "EMCAL_FIRSTYEARv1",TString surveyFilename = "emcal_survey_FIRSTYEARv1.txt",SurveyDataType_t type = kSurvey){
   // Create TClonesArray of full misalignment objects for EMCAL
   //
   const char* macroname = "MakeEMCALFullMisAlignment.C";
-  const AliEMCALGeometry *emcalGeom = AliEMCALGeometry::GetInstance(AliEMCALGeometry::GetDefaultGeometryName(),"");
+  if(geoname=="")geoname=AliEMCALGeometry::GetDefaultGeometryName();
+  const AliEMCALGeometry *emcalGeom = AliEMCALGeometry::GetInstance(geoname,"");
   if(!emcalGeom) {
     Error("MakeEMCALFullMisAlignment","Cannot obtain AliEMCALGeometry singleton\n");
     return;
@@ -12,7 +15,7 @@ void MakeEMCALFullMisAlignment(){
 
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
@@ -40,7 +43,7 @@ void MakeEMCALFullMisAlignment(){
   }    
 
 
-  AliEMCALSurvey emcalSurvey("emcal_survey_data.txt");
+  AliEMCALSurvey emcalSurvey(surveyFilename,type);
   emcalSurvey.CreateAliAlignObjParams(alobj);
 
   // *************************    2nd step    ***************
@@ -61,7 +64,8 @@ void MakeEMCALFullMisAlignment(){
     // save in CDB storage
     AliCDBMetaData* md = new AliCDBMetaData();
     md->SetResponsible("Jennifer Klay");
-    md->SetComment("Full misalignment for EMCAL");
+    md->SetComment("Full misalignment for EMCAL_FIRSTYEAR based on survey information");
+    md->AddDateToComment();
     md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("EMCAL/Align/Data",0,AliCDBRunRange::Infinity());
     storage->Put(array,id,md);