minor update of HLT TRD macros (Theodor)

- don't use std::sort in CINT, as it has issues
- use same defaults for all macros

diff --git a/HLT/TRD/macros/aliHLTTRDrun.cxx b/HLT/TRD/macros/aliHLTTRDrun.cxx
index 7240c1824ac070a855e76b4afbac624af6b18f34..ebe19dc78c31d2d0d3ffbd53675a510ce9a0fcaf 100644 (file)
--- a/HLT/TRD/macros/aliHLTTRDrun.cxx
+++ b/HLT/TRD/macros/aliHLTTRDrun.cxx
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <stdlib.h>
 #include <fstream>
+#include <algorithm>
 
 #include "TString.h"
 #include "TMath.h"
@@ -19,7 +20,6 @@
 #include <sys/time.h>
 #endif
 
-#include <algorithm>
 #include "initGRP.h"
 
 void aliHLTTRDrun(const TString inDir = gSystem->pwd());
@@ -42,7 +42,7 @@ void aliHLTTRDrun(const TString inDir)
   Bool_t customArgs=kTRUE;
 
   // Disable HLT flag?
-  Bool_t disableHLTflag=kTRUE;
+  Bool_t disableHLTflag=kFALSE;
 
 
 
@@ -54,7 +54,9 @@ void aliHLTTRDrun(const TString inDir)
     for(int i=0; i<18; i++)
       TRDmodules[i]=i;
   }else{
+#if !defined (__CINT__) || defined (__MAKECINT__)
     std::sort((UInt_t*)TRDmodules, ((UInt_t*)TRDmodules) + 18);
+#endif
     for(int i=0; i<18; i++)
       if(TRDmodules[i]>-1)usedModules++;
   }

diff --git a/HLT/TRD/macros/rec-hlt-trd.cxx b/HLT/TRD/macros/rec-hlt-trd.cxx
index e29eff8e2fe2ed1ba16839c9f35c7cdb51f8e262..1641458e2644266e375bc050d2c11aef9dc680eb 100644 (file)
--- a/HLT/TRD/macros/rec-hlt-trd.cxx
+++ b/HLT/TRD/macros/rec-hlt-trd.cxx
@@ -10,6 +10,7 @@
 #include <iostream>
 #include <stdlib.h>
 #include <fstream>
+#include <algorithm>
 
 #include "TString.h"
 #include "TMath.h"
@@ -35,6 +36,7 @@
 #include "AliExternalTrackParam.h"
 #endif
 
+
 int rec_hlt_trd(const TString input ="raw.root", TString outPath=gSystem->pwd());
 Int_t ExtractRunNumber(const TString str);
 int main(int argc, char** argv)
@@ -62,7 +64,7 @@ int rec_hlt_trd(const TString filename, TString outPath)
   Bool_t useOnlyTRDtrigger=kFALSE;
 
   // Is the TRD full? (this is only important if ddl files should be read)
-  Bool_t fullTRD=kTRUE;
+  Bool_t fullTRD=kFALSE;
 
   // If not use these SMs:
   Int_t TRDmodules[18] = {0,1,7,8,9,10,17,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
@@ -129,7 +131,9 @@ int rec_hlt_trd(const TString filename, TString outPath)
     for(int i=0; i<18; i++)
       TRDmodules[i]=i;
   }else{
+#if !defined (__CINT__) || defined (__MAKECINT__)
     std::sort((UInt_t*)TRDmodules, ((UInt_t*)TRDmodules) + 18);
+#endif
     for(int i=0; i<18; i++)
       if(TRDmodules[i]>-1)usedModules++;
   }