Coding convention corrections

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

diff --git a/MONITOR/AliMonitorProcess.cxx b/MONITOR/AliMonitorProcess.cxx
index bf2edede0b97f3d2530baf8c32880ce471f28742..9097d42954874f9894b5805c90209ab4734c08f3 100644 (file)
--- a/MONITOR/AliMonitorProcess.cxx
+++ b/MONITOR/AliMonitorProcess.cxx
@@ -25,43 +25,45 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TFile.h>
+#include <TGrid.h>
+#include <TGridResult.h>
+#include <TMessage.h>
+#include <TROOT.h>
+#include <TServerSocket.h>
+#include <TSocket.h>
 
+#include "AliITS.h"
+#include "AliITSLoader.h"
+#include "AliITSclustererV2.h"
+#include "AliITStrackerV2.h"
+#include "AliLoader.h"
+#include "AliMonitorHLT.h"
+#include "AliMonitorHLTHough.h"
+#include "AliMonitorITS.h"
 #include "AliMonitorProcess.h"
 #include "AliMonitorTPC.h"
-#include "AliMonitorITS.h"
 #include "AliMonitorV0s.h"
-#include "AliMonitorHLT.h"
-#include "AliMonitorHLTHough.h"
 #include "AliRawReaderRoot.h"
-#include "AliLoader.h"
 #include "AliRun.h"
 #include "AliTPC.h"
 #include "AliTPCclustererMI.h"
 #include "AliTPCtrackerMI.h"
-#include "AliITS.h"
-#include "AliITSclustererV2.h"
-#include "AliITStrackerV2.h"
-#include "AliITSLoader.h"
 #include "AliV0vertexer.h"
-#include <TGrid.h>
-#include <TSocket.h>
-#include <TServerSocket.h>
-#include <TMessage.h>
-#include <TGridResult.h>
-#include <TROOT.h>
+
 #ifdef ALI_HLT
-#include <AliLevel3.h>
-#include <AliL3Transform.h>
+#include <AliL3ClusterFitter.h>
+#include <AliL3DDLDataFileHandler.h>
+#include <AliL3Fitter.h>
+#include <AliL3Hough.h>
+#include <AliL3HoughBaseTransformer.h>
+#include <AliL3HoughMaxFinder.h>
+#include <AliL3StandardIncludes.h>
 #include <AliL3Track.h>
 #include <AliL3TrackArray.h>
-#include <AliL3StandardIncludes.h>
-#include <AliL3HoughMaxFinder.h>
-#include <AliL3HoughBaseTransformer.h>
-#include <AliL3Hough.h>
-#include <AliL3ClusterFitter.h>
+#include <AliL3Transform.h>
 #include <AliL3Vertex.h>
-#include <AliL3Fitter.h>
-#include <AliL3DDLDataFileHandler.h>
+#include <AliLevel3.h>
 #endif
 
 ClassImp(AliMonitorProcess) 
@@ -306,14 +308,15 @@ Bool_t AliMonitorProcess::CheckForNewFile()
 #if ROOT_VERSION_CODE <= 199169   // 3.10/01
   TGridResult* result = fGrid->Ls();
 #else
-//  Grid_ResultHandle_t handle = fGrid->OpenDir(fAlienDir);
   TDatime datime;
+  char dirName[256];
+  sprintf(dirName, "%s/adc-%d", fAlienDir.Data(), datime.GetDate());
   char findName[256];
-  sprintf(findName, "*_%d_*.root", datime.GetDate());
-  Grid_ResultHandle_t handle = fGrid->Find(fAlienDir, findName);
+  sprintf(findName, "*.root");
+  Grid_ResultHandle_t handle = fGrid->Find(dirName, findName);
   if (!handle) {
     Error("CheckForNewFile", "could not open alien directory %s", 
-         fAlienDir.Data());
+         dirName);
     return kFALSE;
   }
   TGridResult* result = fGrid->CreateGridResult(handle);
@@ -356,7 +359,7 @@ Bool_t AliMonitorProcess::CheckForNewFile()
   result = fGrid->GetPhysicalFileNames(fLogicalFileName.Data());
   fFileName = result->Next();
 #else
-  fileName = fAlienDir + "/" + fLogicalFileName;
+  fileName = dirName + ("/" + fLogicalFileName);
   handle = fGrid->GetPhysicalFileNames(fileName.Data());
   if (!handle) {
     Error("CheckForNewFile", "could not get physical file names for %s", 
@@ -573,6 +576,7 @@ Bool_t AliMonitorProcess::ReconstructTPC(AliRawReader* rawReader)
     tracker.Clusters2Tracks();
     tracker.WriteTracks();
     tracker.UnloadClusters();
+    tpcLoader->WriteTracks("OVERWRITE");
   }
 
   tpcLoader->UnloadRecPoints();
@@ -845,7 +849,7 @@ Bool_t AliMonitorProcess::ReconstructHLTHough(
       if(track->GetNHits() < 20) continue;
       ft->SortTrackClusters(track);
       ft->FitHelix(track);
-      ft->UpdateTrack(track);
+      track->UpdateToFirstPoint();
     }
   delete ft;