Removing inheritances from TAttLine, TAttMarker and AliRndm in AliModule. The copy...

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

diff --git a/MONITOR/AliMonitorHLT.cxx b/MONITOR/AliMonitorHLT.cxx
index 6c11905eac6aefb6e0032a0c057c70178c3a4a1a..a58bf2b4b35b3cbb8bfeb18691197c83f0042f10 100644 (file)
--- a/MONITOR/AliMonitorHLT.cxx
+++ b/MONITOR/AliMonitorHLT.cxx
@@ -25,8 +25,8 @@
 #include "AliMonitorHLT.h"
 #include "AliMonitorTrend.h"
 #include "AliTPCParam.h"
+#include "AliLog.h"
 #include <TFolder.h>
-#ifdef ALI_HLT
 #include <stdlib.h>
 #include "AliL3MemHandler.h"
 #include "AliL3SpacePointData.h"
@@ -34,31 +34,32 @@
 #include "AliL3Track.h"
 #include "AliL3Transform.h"
 #include "AliL3Vertex.h"
-#endif
 
 //_____________________________________________________________________________
-AliMonitorHLT::AliMonitorHLT(AliTPCParam* param)
+AliMonitorHLT::AliMonitorHLT(AliTPCParam* param):
+  AliMonitor(),
+  fParam(param),
+  fClustersCharge(NULL),
+  fNClustersVsRow(NULL),
+  fNClustersVsSector(NULL),
+  fNTracks(NULL),
+  fTrackPt(NULL),
+  fTrackEta(NULL),
+  fTrackPhi(NULL),
+  fTrackNHits(NULL),
+  fTrackDEdxVsP(NULL),
+  fTrackDEdx(NULL),
+  fTrackDz0(NULL),
+  fTrackDr0(NULL),
+  fTrackEtaVsPhi(NULL),
+  fPtEtaVsPhi(NULL),
+  fTrackZvsNHits(NULL),
+  fTrackXYvsNHits(NULL)
 {
 // create a HLT monitor object with the given parameters
 
-  fParam = param;
 }
 
-//_____________________________________________________________________________
-AliMonitorHLT::AliMonitorHLT(const AliMonitorHLT& monitor) :
-  AliMonitor(monitor)
-{
-  Fatal("AliMonitorHLT", "copy constructor not implemented");
-}
-
-//_____________________________________________________________________________
-AliMonitorHLT& AliMonitorHLT::operator = (const AliMonitorHLT& /*monitor*/)
-{
-  Fatal("operator =", "assignment operator not implemented");
-  return *this;
-}
-
-
 //_____________________________________________________________________________
 void AliMonitorHLT::CreateHistos(TFolder* folder)
 {
@@ -151,17 +152,13 @@ void AliMonitorHLT::FillHistos(AliRunLoader* /*runLoader*/,
 {
 // fill the HLT monitor histogrms
 
-#ifndef ALI_HLT
-  Warning("FillHistos", "the code was compiled without HLT support");
-
-#else
   AliL3MemHandler clusterHandler[36];
   AliL3SpacePointData *clusters[36];
   for (Int_t iSector = 0; iSector < fParam->GetNInnerSector(); iSector++) {
     char fileName[256];
     sprintf(fileName, "hlt/points_%d_-1.raw", iSector);
     if (!clusterHandler[iSector].SetBinaryInput(fileName)) {
-      Warning("FillHistos", "could not open file %s", fileName);
+      AliWarning(Form("could not open file %s", fileName));
       continue;
     }
     clusters[iSector] = (AliL3SpacePointData*) clusterHandler[iSector].Allocate();
@@ -182,7 +179,7 @@ void AliMonitorHLT::FillHistos(AliRunLoader* /*runLoader*/,
 
   AliL3MemHandler memHandler;
   if (!memHandler.SetBinaryInput("hlt/tracks.raw")) {
-    Warning("FillHistos", "could not open file hlt/tracks.raw");
+    AliWarning("could not open file hlt/tracks.raw");
     return;
   }
   AliL3TrackArray* tracks = new AliL3TrackArray;
@@ -196,7 +193,7 @@ void AliMonitorHLT::FillHistos(AliRunLoader* /*runLoader*/,
     if(!track) continue;
     track->CalculateHelix();
     track->GetClosestPoint(&vertex,xc,yc,zc);
-    if(fabs(zc)>10.) continue;
+    if(TMath::Abs(zc)>10.) continue;
     fTrackPt->Fill(track->GetPt());
     fTrackEta->Fill(track->GetPseudoRapidity());
     fTrackPhi->Fill(track->GetPsi() * TMath::RadToDeg());
@@ -256,5 +253,4 @@ void AliMonitorHLT::FillHistos(AliRunLoader* /*runLoader*/,
 
   delete tracks;
   memHandler.CloseBinaryInput();
-#endif
 }