Overlaps corrected, new shape of sectors

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

diff --git a/ITS/AliITSDigits2RecPoints.C b/ITS/AliITSDigits2RecPoints.C
index 8241d2a169f885059abf735e3759a800c79efefe..404b024f3025721d118663ae7de19e9c1fd6c5b0 100644 (file)
--- a/ITS/AliITSDigits2RecPoints.C
+++ b/ITS/AliITSDigits2RecPoints.C
@@ -1,14 +1,15 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 
-#include "Riostream.h"
-#include "TClassTable.h"
-#include "TDatime.h"
-#include "TStopwatch.h"
+#include <Riostream.h>
+#include <TClassTable.h>
+#include <TDatime.h>
+#include <TGeoManager.h>
+#include <TROOT.h>
+#include <TStopwatch.h>
 #include "AliRun.h"
 #include "AliRunDigitizer.h"
-#include "AliITSDigitizer.h"
+#include "AliITSDetTypeRec.h"
 #include "AliITS.h"
-#include "AliITSDetType.h"
 #include "AliITSresponseSDD.h"
 #include "AliITSreconstruction.h"
 
@@ -16,29 +17,32 @@
 #define DEBUG
 
 Int_t AliITSDigits2RecPoints(TString filename="galice.root",TString fileRP=""){
-    // Standard ITS Digits to RecPoints.
+  // Standard ITS Digits to RecPoints.
 
-    // Dynamically link some shared libs
-    if (gClassTable->GetID("AliRun") < 0) {
-      gROOT->ProcessLine(".x $(ALICE_ROOT)/macros/loadlibs.C");
-    }else if (gAlice){
-      delete gAlice->GetRunLoader();
-      delete gAlice;
-      gAlice=0;
-     } // end if
+  // Get geometry
+  TGeoManager::Import("geometry.root");
 
-    TStopwatch timer;
+  // Dynamically link some shared libs
+  if (gClassTable->GetID("AliRun") < 0) {
+    gROOT->ProcessLine(".x $(ALICE_ROOT)/macros/loadlibs.C");
+  }else if (gAlice){
+    delete AliRunLoader::Instance();
+    delete gAlice;
+    gAlice=0;
+  } // end if
+
+  TStopwatch timer;
 #ifdef DEBUG
-    cout << "Creating reconstructed points from digits for the ITS..." << endl;
+  cout << "Creating reconstructed points from digits for the ITS..." << endl;
 #endif
-    AliITSreconstruction *itsr = new AliITSreconstruction(filename);
+  AliITSreconstruction *itsr = new AliITSreconstruction(filename);
 
-    timer.Start();
-    if(!(fileRP.IsNull()))itsr->SetOutputFile(fileRP);
-    itsr->Init();
-    itsr->Exec(); 
-    timer.Stop(); 
-    timer.Print();
-    delete itsr;
-    return 0;
+  timer.Start();
+  if(!(fileRP.IsNull()))itsr->SetOutputFile(fileRP);
+  itsr->Init();
+  itsr->Exec(); 
+  timer.Stop(); 
+  timer.Print();
+  delete itsr;
+  return 0;
 }