Adding PiKP-only histograms and eliminating a number of switches where histograms...

[u/mrichter/AliRoot.git] / MUON / mchview.cxx

diff --git a/MUON/mchview.cxx b/MUON/mchview.cxx
index b0debd5b0380f427a4dab4bb68387b2c9c75248d..918cc1c0e9c58c4ff506596a059412d80c9f4c92 100644 (file)
--- a/MUON/mchview.cxx
+++ b/MUON/mchview.cxx
@@ -52,6 +52,7 @@ Int_t Usage()
   cout << "  --asciimapping : load mapping from ASCII files instead of OCDB (for debug and experts only...)" << endl;
   cout << "  --de detElemId : start by displaying the given detection element instead of the default view (which is all the chambers)" << endl;
   cout << "  --chamber chamberId (from 1 to 10) : start by displaying the given chamber instead of the default view (which is all the chambers)" << endl;
+  cout << "  --ocdb ocdbPath : read the mapping from the given OCDB" << endl;
   return -1;
 }
 
@@ -70,9 +71,10 @@ int main(int argc, char** argv)
   
   TObjArray filesToOpen;
   Bool_t isGeometryFixed(kFALSE);
-  Int_t gix, giy;
-  Int_t gox,goy;
+  Int_t gix(0),giy(0);
+  Int_t gox(0),goy(0);
   Bool_t ASCIImapping(kFALSE);
+  TString defaultOCDB("local://$ALICE_ROOT/OCDB");
   
   for ( Int_t i = 0; i <= args.GetLast(); ++i ) 
   {
@@ -93,7 +95,7 @@ int main(int argc, char** argv)
     {
       isGeometryFixed = kTRUE;
       TString g(static_cast<TObjString*>(args.At(i+1))->String());
-      sscanf(g.Data(),"%dx%d+%d+%d",&gix,&giy,&gox,&goy);
+      sscanf(g.Data(),"%10dx%10d+%10d+%10d",&gix,&giy,&gox,&goy);
       nok += 2;
       ++i;
     }
@@ -108,6 +110,13 @@ int main(int argc, char** argv)
       nok += 2;
       ++i;      
     }
+    else if ( a == "--ocdb" )
+    {
+      defaultOCDB = static_cast<TObjString*>(args.At(i+1))->String();
+      cout << "Using default storage  = " << defaultOCDB.Data() << endl;
+      nok += 2;
+      ++i;
+    }
     else
     {
       return Usage();
@@ -119,9 +128,7 @@ int main(int argc, char** argv)
     return Usage();
   }
   
-  AliWarningGeneral("main","FIXME ? Remove default storage and run number from here...");
-  
-  AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+  AliCDBManager::Instance()->SetDefaultStorage(defaultOCDB.Data());
   AliCDBManager::Instance()->SetRun(0);
  
   if ( ASCIImapping ) 
@@ -155,23 +162,17 @@ int main(int argc, char** argv)
   gStyle->SetPalette(n+2,colors);
   delete[] colors;
 
-  UInt_t w(0);
-  UInt_t h(0);
-  UInt_t ox(0);
-  UInt_t oy(0);
+  AliMUONMchViewApplication* theApp(0x0);
 
   if ( isGeometryFixed )
   {
-    w = gix;
-    h = giy;
-    ox = gox;
-    oy = goy;
+    theApp = new AliMUONMchViewApplication("mchview", &argc, argv,gix,giy,gox,goy);
+  }
+  else
+  {
+    theApp = new AliMUONMchViewApplication("mchview",&argc,argv);
   }
-  
-  AliMUONMchViewApplication* theApp = new AliMUONMchViewApplication("mchview", &argc, argv, w,h,gox,goy);
    
-  AliCodeTimer::Instance()->Print();
-
   TIter next(&filesToOpen);
   TObjString* s;
   while ( ( s = static_cast<TObjString*>(next()) ) )