update geometry name to Run2

sevdokim · Apr 16, 2015 · aa817f6 · aa817f6
1 parent f66db81
commit aa817f6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/EMCAL/macros/TestEMCALRecPoint.C b/EMCAL/macros/TestEMCALRecPoint.C
@@ -27,7 +27,7 @@ void TestEMCALRecPoint()
   }
   else {
     cout<<"alirun not available, instantiate"<<endl;
-    geom =  AliEMCALGeometry::GetInstance("EMCAL_COMPLETE12SMV1") ;  
+    geom =  AliEMCALGeometry::GetInstance("EMCAL_COMPLETE12SMV1_DCAL_8SM") ;
   } 
 
   //Load RecPoints

diff --git a/EMCAL/macros/TestESD.C b/EMCAL/macros/TestESD.C
@@ -69,7 +69,7 @@ void TestESD() {
 
   //Init geometry and array that will contain the clusters
   TRefArray* caloClusters = new TRefArray();
-  AliEMCALGeometry *geom =  AliEMCALGeometry::GetInstance("EMCAL_FIRSTYEAR") ;  	
+  AliEMCALGeometry *geom =  AliEMCALGeometry::GetInstance("EMCAL_COMPLETE12SMV1_DCAL_8SM") ;  	
   Float_t pos[3];
 
   //Loop of events

diff --git a/EMCAL/macros/TestMatrices.C b/EMCAL/macros/TestMatrices.C
@@ -4,20 +4,29 @@ void TestMatrices(Bool_t test2011=1)
 
   AliCDBManager* man = AliCDBManager::Instance();
   man->SetDefaultStorage("alien://Folder=/alice/simulation/2008/v4-15-Release/Ideal/");
-  const char *geoname = "EMCAL_COMPLETEV1";
-  if (test2011) {
+
+  const char *geoname = "EMCAL_COMPLETE12SMV1_DCAL_8SM";
+
+  if (test2011)
+  {
     man->SetSpecificStorage("EMCAL/Align/Data",             "alien://folder=/alice/data/2011/OCDB");
     man->SetRun(146805);
-  } else {
+    geoname = "EMCAL_COMPLETEV1";
+  }
+  else
+  {
     man->SetSpecificStorage("EMCAL/Align/Data",             "alien://folder=/alice/data/2010/OCDB");
     man->SetRun(137366);
     geoname = "EMCAL_FIRSTYEARV1";
   }
+
   AliGeomManager::LoadGeometry();
   AliGeomManager::ApplyAlignObjsFromCDB("EMCAL");
+
   AliEMCALGeometry *geo =  AliEMCALGeometry::GetInstance(geoname);
+
   for (Int_t i=0;i<(geo->GetEMCGeometry())->GetNumberOfSuperModules();++i)
-    geo->GetMatrixForSuperModule(i)->Print();
+  geo->GetMatrixForSuperModule(i)->Print();
 
   AliEMCALEMCGeometry *emc = geo->GetEMCGeometry();
   Double_t phimin = emc->GetArm1PhiMin();