From: cholm <cholm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 5 Jan 2011 11:30:44 +0000 (+0000)
Subject: Minor fixes
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=631eaf16537af13661b7877349549ab430cd6118

Minor fixes
---

diff --git a/PWG2/FORWARD/analysis2/Pass1.C b/PWG2/FORWARD/analysis2/Pass1.C
index 98c68e1354e..e2d3a549a49 100644
--- a/PWG2/FORWARD/analysis2/Pass1.C
+++ b/PWG2/FORWARD/analysis2/Pass1.C
@@ -10,47 +10,23 @@
  *                  *AliESDs*.root are added to the chain 
  * @param nEvents   Number of events to process.  If 0 or less, then 
  *                  all events are analysed
- * @param flags     Job flags. A bit mask of 
- *  - 0x01 (MC)        Monte-Carlo truth handler installed 
- *  - 0x02 (PROOF)     Proof mode 
- *  - 0x04 (FULL)      Run full analysis - including terminate 
- *  - 0x08 (ANALYSE)   Run only analysis - not terminate 
- *  - 0x10 (TERMINATE) Run no analysis - just terminate.  
- * 
- * of these, PROOF, FULL, ANALYSE, and TERMINATE are mutually exclusive. 
- *
- * If PROOF mode is selected, then Terminate will be run on the master node 
- * in any case. 
- * 
- * If FULL is selected, then the full analysis is done.  Note that
- * this can be combined with PROOF but with no effect.
- *
- * ANALYSE cannot be combined with FULL, PROOF, or TERMINATE.  In a
- * local job, the output AnalysisResults.root will still be made, but
- * terminate is not called.
- *
- * In TERMINATE, the file AnalysisResults.root is opened and all
- * containers found are connected to the tasks.  The terminate member
- * function is then called
- * 
+ * @param proof     Proof mode
+ * @param mc        Monte-Carlo truth handler installed 
  *
  * @ingroup pwg2_forward_scripts
  */
 void
 Pass1(const char* esddir=".", 
       Int_t       nEvents=1000,
-      UShort_t    flags=0x4)
+      Bool_t      proof=false, 
+      Bool_t      mc=false)
 {
-  Printf("Flags: 0x%04x", flags);
-  Printf("  MC:            %s", flags & 0x01 ? "yes" : "no");
-  Printf("  Proof mode     %s", flags & 0x02 ? "yes" : "no");
-  Printf("  Full analysis  %s", flags & 0x04 ? "yes" : "no");
-  Printf("  Analyse only   %s", flags & 0x08 ? "yes" : "no");
-  Printf("  Terminate only %s", flags & 0x10 ? "yes" : "no");
+  Printf("  MC:            %s", mc    ? "yes" : "no");
+  Printf("  Proof mode     %s", proof ? "yes" : "no");
 
-  gROOT->LoadMacro("$ALICE_ROOT/PWG2/FORWARD/analysis2/RunManager.C"); 
+  gROOT->LoadMacro("$ALICE_ROOT/PWG2/FORWARD/analysis2/MakeAOD.C"); 
 
-  RunManager(esddir, nEvents, flags);
+  MakeAOD(esddir, nEvents, proof, mc);
 }
 //
 // EOF
diff --git a/PWG2/FORWARD/analysis2/Pass2.C b/PWG2/FORWARD/analysis2/Pass2.C
index 91d70cdd693..4b16b62dc3d 100644
--- a/PWG2/FORWARD/analysis2/Pass2.C
+++ b/PWG2/FORWARD/analysis2/Pass2.C
@@ -31,7 +31,7 @@ Pass2(const char* file="AliAODs.root",
       bool        comp=true)
 {
   gROOT->LoadMacro("$ALICE_ROOT/PWG2/FORWARD/analysis2/scripts/Compile.C"); 
-  Compile("$ALICE_ROOT/PWG2/FORWARD/analysis2/DrawRes.C","g"); 
+  Compile("$ALICE_ROOT/PWG2/FORWARD/analysis2/AnalyseAOD.C","g"); 
   
   Int_t trgMask; 
   TString     trgs(triggers);
@@ -68,7 +68,7 @@ Pass2(const char* file="AliAODs.root",
 	 file, vzMin, vzMax, rebin, trgMask, trgs.Data(), energy, tit.Data(),
 	 hhd ? "yes" : "no", comp ? "yes" : "no");
   
-  DrawRes dr;
+  AnalyseAOD dr;
   TStopwatch t;
   t.Start();
   dr.Run(file, vzMin, vzMax, rebin, trgMask, energy, tit.Data(), hhd, comp);