Adding Domenico Colella as responsible for SPD part in TRI pp

[u/mrichter/AliRoot.git] / MONITOR / monitor.C

diff --git a/MONITOR/monitor.C b/MONITOR/monitor.C
index cc3555c33d4e381c7e41216e2d6221d01ce353e1..91572515b158ec7ea5bf01359a20f8b2b78f1541 100644 (file)
--- a/MONITOR/monitor.C
+++ b/MONITOR/monitor.C
@@ -1,35 +1,42 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
-#include "TSystem.h"
-#include "TInterpreter.h"
+#include <TSystem.h>
+#include <TError.h>
+#include <TInterpreter.h>
+#include "AliRun.h"
 #include "MONITOR/AliMonitorProcess.h"
 #include "MONITOR/AliMonitorControl.h"
 #endif
 
-void monitor(const char* alienDir = ".")
+void monitor(Bool_t batchMode = kFALSE,
+            const char* selection = "ALL",
+            const char* alienHost = "alien://aliens7.cern.ch:15000/?direct",
+            const char* alienDir = "/alice_mdc/DC")
 {
   // load libraries
-  if (strcmp(gSystem->Getenv("ALIHLT_USEPACKAGE"), "ALIROOT") == 0) {
-    if (!gROOT->GetClass("AliLevel3")) {
-      gSystem->Load("libAliL3Src.so");
-      gSystem->Load("libAliL3Misc.so");
-      gSystem->Load("libAliL3Hough.so");
-      gSystem->Load("libAliL3Comp.so");
-    }
+  if (!gROOT->GetClass("AliLevel3")) {
+    gSystem->Load("libAliHLTSrc");
+    gSystem->Load("libAliHLTMisc");
+    gSystem->Load("libAliHLTHough");
+    gSystem->Load("libAliHLTComp");
   }
   if (!gROOT->GetClass("AliMonitorProcess")) {
-    gSystem->Load("libMONITOR.so");
+    gSystem->Load("libMONITOR");
   }
 
-  // make sure galice.root and compression tables are there
+  // make sure galice.root is there
   if (!gSystem->Which(".", "galice.root")) {
-    gInterpreter->ExecuteMacro("$ALICE_ROOT/MONITOR/galice.C");
-  }
-  if (!gSystem->Which(".", "Table0.dat")) {
-    gSystem->Exec("cp $ALICE_ROOT/RAW/Table*.dat .");
+    gAlice->InitMC("$ALICE_ROOT/MONITOR/galice.C");
+    AliRunLoader::Instance()->Write();
+    delete AliRunLoader::Instance();
   }
 
   // start the monitoring
-  AliMonitorProcess *process = new AliMonitorProcess(alienDir);
-  //  process->Run();
-  new AliMonitorControl(process);
+  AliMonitorProcess *process = new AliMonitorProcess(alienHost, alienDir,
+                                                    selection);
+  if (batchMode) {
+    process->Run();
+    delete process;
+  } else {
+    new AliMonitorControl(process);
+  }
 }