TOF + macros to each detector folder

[u/mrichter/AliRoot.git] / ITS / ShowITSHitsRecPoints.C

diff --git a/ITS/ShowITSHitsRecPoints.C b/ITS/ShowITSHitsRecPoints.C
index 2090eee5bfb6e4ffe794f5cfcde0afb0d247dfbe..d340d30f65e747e46c7a3307a13734de4fbfc636 100644 (file)
--- a/ITS/ShowITSHitsRecPoints.C
+++ b/ITS/ShowITSHitsRecPoints.C
@@ -16,7 +16,7 @@
 #include "AliRun.h"
 #endif
 
-Int_t ShowITSHitsRecPoints(Bool_t align=kFALSE
+Int_t ShowITSHitsRecPoints(Bool_t align=kFALSE,
                           TString alignfile="ITSfullv11Misalignment.root")
 {
   ///////////////////////////////////////////////////////////////////////
@@ -28,7 +28,7 @@ Int_t ShowITSHitsRecPoints(Bool_t align=kFALSE
   }
   else { 
     if(gAlice){
-      delete gAlice->GetRunLoader();
+      delete AliRunLoader::Instance();
       delete gAlice;
       gAlice=0;
     }
@@ -37,7 +37,7 @@ Int_t ShowITSHitsRecPoints(Bool_t align=kFALSE
   AliCDBManager* man = AliCDBManager::Instance();
   if (!man->IsDefaultStorageSet()) {
     printf("Setting a local default storage and run number 0\n");
-    man->SetDefaultStorage("local://$ALICE_ROOT");
+    man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     man->SetRun(0);
   }
   else {
@@ -48,11 +48,14 @@ Int_t ShowITSHitsRecPoints(Bool_t align=kFALSE
   if(!gGeoManager){
     AliGeomManager::LoadGeometry("geometry.root");
   }
+
   if(align) {
     TFile f(alignfile.Data());
     TClonesArray* ar = (TClonesArray*)f.Get("ITSAlignObjs");
     AliGeomManager::ApplyAlignObjsToGeom(*ar);
     f.Close();
+  } else {
+    AliGeomManager::ApplyAlignObjsFromCDB("ITS");
   }
 
   AliRunLoader* rl = AliRunLoader::Open("galice.root");
@@ -325,7 +328,7 @@ Int_t ShowITSHitsRecPoints(Bool_t align=kFALSE
 }
 
 
-Int_t ShowITSHitsRecPointsNtuple(Bool_t align=kFALSE
+Int_t ShowITSHitsRecPointsNtuple(Bool_t align=kFALSE,
                                 TString alignfile="ITSfullv11Misalignment.root")
 {
   ///////////////////////////////////////////////////////////////////////
@@ -338,7 +341,7 @@ Int_t ShowITSHitsRecPointsNtuple(Bool_t align=kFALSE
   }
   else { 
     if(gAlice){
-      delete gAlice->GetRunLoader();
+      delete AliRunLoader::Instance();
       delete gAlice;
       gAlice=0;
     }
@@ -347,7 +350,7 @@ Int_t ShowITSHitsRecPointsNtuple(Bool_t align=kFALSE
   AliCDBManager* man = AliCDBManager::Instance();
   if (!man->IsDefaultStorageSet()) {
     printf("Setting a local default storage and run number 0\n");
-    man->SetDefaultStorage("local://$ALICE_ROOT");
+    man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     man->SetRun(0);
   }
   else {
@@ -363,8 +366,11 @@ Int_t ShowITSHitsRecPointsNtuple(Bool_t align=kFALSE
     TClonesArray* ar = (TClonesArray*)f.Get("ITSAlignObjs");
     AliGeomManager::ApplyAlignObjsToGeom(*ar);
     f.Close();
+  } else {
+    AliGeomManager::ApplyAlignObjsFromCDB("ITS");
   }
 
+
   AliRunLoader* rl = AliRunLoader::Open("galice.root");
   if (rl == 0x0){
     cerr<<"Can not open session RL=NULL"<< endl;