Coding violation fixes

[u/mrichter/AliRoot.git] / MONITOR / AliMonitorProcess.cxx

diff --git a/MONITOR/AliMonitorProcess.cxx b/MONITOR/AliMonitorProcess.cxx
index d1e435707937fd29bd9f76687e93fb9e0a44086f..9cfe950da8ce7e0b3d52d58c26d07be5bc58b4a5 100644 (file)
--- a/MONITOR/AliMonitorProcess.cxx
+++ b/MONITOR/AliMonitorProcess.cxx
@@ -34,13 +34,18 @@
 #include <TSocket.h>
 
 #include "AliLog.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliITSclustererV2.h"
 #include "AliITSgeom.h"
 #include "AliITStrackerV2.h"
 #include "AliLoader.h"
+// Matthias 2007-10-03 HLT legacy code disabled
+// everything encapsulated by ENABLE_ALIMONITORPROCESS_HLT
+// set the define in the header file to include the code
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
 #include "AliMonitorHLT.h"
 #include "AliMonitorHLTHough.h"
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 #include "AliMonitorITS.h"
 #include "AliMonitorProcess.h"
 #include "AliMonitorTPC.h"
@@ -52,6 +57,7 @@
 #include "AliTPCtrackerMI.h"
 #include "AliV0vertexer.h"
 
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
 #include <AliHLTStandardIncludes.h>
 #include <AliHLTMemHandler.h>
 #include <AliHLTClusterFitter.h>
@@ -64,6 +70,7 @@
 #include <AliHLTTransform.h>
 #include <AliHLTVertex.h>
 #include <AliLevel3.h>
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 
 ClassImp(AliMonitorProcess)
 
@@ -143,11 +150,13 @@ AliMonitorProcess::AliMonitorProcess(
   fITSgeom = (AliITSgeom*)gDirectory->Get("AliITSgeom");
   if (!fITSgeom) AliFatal("could not load ITS geometry");
 
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
   // Init TPC parameters for HLT
   Bool_t isinit=AliHLTTransform::Init(const_cast<char*>(fileNameGalice),kTRUE);
   if(!isinit){
     AliFatal("Could not create transform settings, please check log for error messages!");
   }
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 
   fTopFolder = new TFolder("Monitor", "monitor histograms");
   fTopFolder->SetOwner(kTRUE);
@@ -155,8 +164,10 @@ AliMonitorProcess::AliMonitorProcess(
   if (IsSelected("TPC")) fMonitors.Add(new AliMonitorTPC(fTPCParam));
   if (IsSelected("ITS")) fMonitors.Add(new AliMonitorITS(fITSgeom));
   if (IsSelected("V0s")) fMonitors.Add(new AliMonitorV0s);
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
   if (IsSelected("HLTConfMap")) fMonitors.Add(new AliMonitorHLT(fTPCParam));
   if (IsSelected("HLTHough")) fMonitors.Add(new AliMonitorHLTHough(fTPCParam));
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 
   for (Int_t iMonitor = 0; iMonitor < fMonitors.GetEntriesFast(); iMonitor++) {
     ((AliMonitor*) fMonitors[iMonitor])->CreateHistos(fTopFolder);
@@ -253,8 +264,10 @@ AliMonitorProcess::~AliMonitorProcess()
   delete fFile;
   gSystem->Unlink("monitor_tree.root");
 
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
   delete fHLT;
   delete fHLTHough;
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 
   gSystem->RemoveSignalHandler(fInterruptHandler);
   delete fInterruptHandler;
@@ -432,8 +445,10 @@ Bool_t AliMonitorProcess::ProcessFile()
   if (nEvents <= 0) return kFALSE;
   AliDebug(1, Form("found %d event(s) in file %s",
                   nEvents, fFileName.Data()));
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
   if (IsSelected("HLTConfMap")) CreateHLT(fFileName);
   if (IsSelected("HLTHough")) CreateHLTHough(fFileName);
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 
   // loop over the events
   for (Int_t iEvent = 0; iEvent < nEvents; iEvent++) {
@@ -458,7 +473,7 @@ Bool_t AliMonitorProcess::ProcessFile()
     AliInfo(Form("run: %d  event: %d %d\n", rawReader.GetRunNumber(),
                 rawReader.GetEventId()[0], rawReader.GetEventId()[1]));
 
-    AliESD esd;
+    AliESDEvent esd;
     if (IsSelected("TPC")) {
       CheckForConnections();
       if (!ReconstructTPC(&rawReader, &esd)) return kFALSE;
@@ -474,6 +489,7 @@ Bool_t AliMonitorProcess::ProcessFile()
       if (!ReconstructV0s(&esd)) return kFALSE;
       if (fStopping) break;
     }
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
     if (IsSelected("HLTConfMap")) {
       CheckForConnections();
       if (!ReconstructHLT(iEvent)) return kFALSE;
@@ -484,6 +500,7 @@ Bool_t AliMonitorProcess::ProcessFile()
       if (!ReconstructHLTHough(iEvent)) return kFALSE;
       if (fStopping) break;
     }
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 
     if (fDisplaySocket) fDisplaySocket->Send("new event");
 
@@ -522,6 +539,7 @@ Bool_t AliMonitorProcess::ProcessFile()
     if (fStopping) break;
   }
 
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
   if (fHLT) {
     delete fHLT;
     fHLT = NULL;
@@ -530,6 +548,7 @@ Bool_t AliMonitorProcess::ProcessFile()
     delete fHLTHough;
     fHLTHough = NULL;
   }
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 
   return kTRUE;
 }
@@ -597,7 +616,7 @@ Int_t AliMonitorProcess::GetNumberOfEvents(const char* fileName) const
 }
 
 //_____________________________________________________________________________
-Bool_t AliMonitorProcess::ReconstructTPC(AliRawReader* rawReader, AliESD* esd)
+Bool_t AliMonitorProcess::ReconstructTPC(AliRawReader* rawReader, AliESDEvent* esd)
 {
 // find TPC clusters and tracks
 
@@ -631,7 +650,7 @@ Bool_t AliMonitorProcess::ReconstructTPC(AliRawReader* rawReader, AliESD* esd)
 }
 
 //_____________________________________________________________________________
-Bool_t AliMonitorProcess::ReconstructITS(AliRawReader* rawReader, AliESD* esd)
+Bool_t AliMonitorProcess::ReconstructITS(AliRawReader* rawReader, AliESDEvent* esd)
 {
 // find ITS clusters and tracks
 
@@ -647,13 +666,13 @@ Bool_t AliMonitorProcess::ReconstructITS(AliRawReader* rawReader, AliESD* esd)
   // cluster finder
   AliDebug(1, "reconstructing clusters...");
   itsLoader->LoadRecPoints("recreate");
-  AliITSclustererV2 clusterer(fITSgeom);
+  AliITSclustererV2 clusterer(0);
   itsLoader->MakeRecPointsContainer();
   clusterer.Digits2Clusters(rawReader);
 
   // track finder
   AliDebug(1, "reconstructing tracks...");
-  AliITStrackerV2 tracker(fITSgeom);
+  AliITStrackerV2 tracker(0);
   tracker.LoadClusters(itsLoader->TreeR());
   tracker.Clusters2Tracks(esd);
   tracker.UnloadClusters();
@@ -663,7 +682,7 @@ Bool_t AliMonitorProcess::ReconstructITS(AliRawReader* rawReader, AliESD* esd)
 }
 
 //_____________________________________________________________________________
-Bool_t AliMonitorProcess::ReconstructV0s(AliESD* esd)
+Bool_t AliMonitorProcess::ReconstructV0s(AliESDEvent* esd)
 {
 // find V0s
 
@@ -672,14 +691,12 @@ Bool_t AliMonitorProcess::ReconstructV0s(AliESD* esd)
   // V0 finder
   AliDebug(1, "reconstructing V0s...");
   AliV0vertexer vertexer;
-  Double_t vtx[3];
-  esd->GetVertex()->GetXYZ(vtx);
-  vertexer.SetVertex(vtx);
   vertexer.Tracks2V0vertices(esd);
 
   return kTRUE;
 }
 
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
 //_____________________________________________________________________________
 void AliMonitorProcess::CreateHLT(const char* fileName)
 {
@@ -717,7 +734,9 @@ void AliMonitorProcess::CreateHLT(const char* fileName)
 
   fHLT->WriteFiles("./hlt/");
 }
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
 //_____________________________________________________________________________
 void AliMonitorProcess::CreateHLTHough(const char* fileName)
 {
@@ -738,7 +757,9 @@ void AliMonitorProcess::CreateHLTHough(const char* fileName)
   //  fHLTHough->GetMaxFinder()->SetThreshold(14000);
 
 }
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
 //_____________________________________________________________________________
 Bool_t AliMonitorProcess::ReconstructHLT(Int_t iEvent)
 {
@@ -764,7 +785,9 @@ Bool_t AliMonitorProcess::ReconstructHLT(Int_t iEvent)
   gSystem->Exec(command);
   return kTRUE;
 }
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 
+#ifdef ENABLE_ALIMONITORPROCESS_HLT
 //_____________________________________________________________________________
 Bool_t AliMonitorProcess::ReconstructHLTHough(Int_t iEvent)
 {
@@ -861,6 +884,7 @@ Bool_t AliMonitorProcess::ReconstructHLTHough(Int_t iEvent)
   gSystem->Exec(command);
   return kTRUE;
 }
+#endif // ENABLE_ALIMONITORPROCESS_HLT
 
 //_____________________________________________________________________________
 Bool_t AliMonitorProcess::WriteHistos()