Various small fixes for proper detection of MC input, and

some new defaults for generated drawing scripts

diff --git a/PWGLF/FORWARD/analysis2/trains/MakeAODTrain.C b/PWGLF/FORWARD/analysis2/trains/MakeAODTrain.C
index 63ea7ed3e0bcd1393d50b56a47a8b26238b935ae..e860a84de091a411b74d68dd53ec7d1d1f3d60ba 100644 (file)
--- a/PWGLF/FORWARD/analysis2/trains/MakeAODTrain.C
+++ b/PWGLF/FORWARD/analysis2/trains/MakeAODTrain.C
@@ -197,7 +197,7 @@ protected:
     opts.Add("cut-edges", "Cut edges of acceptance", true);
     opts.Add("trigEff", "EFFICIENCY", "Trigger efficiency", 1.);
     opts.Add("trigEff0", "EFFICIENCY", "0-bin trigger efficiency", 1.);
-    opts.Add("mc", "Also analyse MC truth", false);
+    opts.Add("mc", "Also analyse MC truth", fHelper->IsMC());
     
     // Rewrite our URL 
     TString outString = fHelper->OutputLocation();

diff --git a/PWGLF/FORWARD/analysis2/trains/MakeFMDELossTrain.C b/PWGLF/FORWARD/analysis2/trains/MakeFMDELossTrain.C
index a104a3b40de5e56ba3e1c66a92638feb564f2bfc..170fcab6e22f17bfed6f6d4766f30602d3c9312e 100644 (file)
--- a/PWGLF/FORWARD/analysis2/trains/MakeFMDELossTrain.C
+++ b/PWGLF/FORWARD/analysis2/trains/MakeFMDELossTrain.C
@@ -126,12 +126,11 @@ protected:
       return;
     }
     f << "// Generated by " << ClassName() << "\n"
-      << "void Extract()\n"
+      << "void Extract(Bool_t mc=" << HasMCHandler() << ")\n"
       << "{\n"
       << "  const char* fwd=\"$ALICE_ROOT/PWGLF/FORWARD/analysis2\";\n"
       << "  gROOT->LoadMacro(Form(\"%s/corrs/ExtractELoss.C\",fwd));\n"
-      << "  ExtractELoss(\"forward_eloss.root\"," 
-      <<  fHelper->IsMC() << ");\n"
+      << "  ExtractELoss(\"forward_eloss.root\",mc);\n" 
       << "}\n"
       << "// EOF" << std::endl;
     f.close();
@@ -143,9 +142,10 @@ protected:
       Error("SaveSummarize", "Failed to open Summarize.C script");
       return;
     }
-    f << "// Generated by " << ClassName() << "\n"
+    f << std::boolalpha 
+      << "// Generated by " << ClassName() << "\n"
       << "//\n"
-      << "void Summarize(Bool_t mc=false,\n"
+      << "void Summarize(Bool_t mc=" << HasMCHandler() << ",\n"
       << "               const char* filename=\"forward_eloss.root\")\n"
       << "{\n"
       << "  const char* fwd=\"$ALICE_ROOT/PWGLF/FORWARD/analysis2\";\n"
@@ -157,11 +157,11 @@ protected:
   }
   void PostShellCode(std::ostream& f)
   {
-    Bool_t   mc   = HasMCHandler();
-    f << "  echo \"=== Extracting Corrections ...\"\n"
-      << "  aliroot -l -b -q ${prefix}Extract.C\n"
+    f << "  mc=" << std::boolalpha << HasMCHandler() << "\n"
+      << "  echo \"=== Extracting Corrections ...\"\n"
+      << "  aliroot -l -b -q ${prefix}Extract.C\\($mc\\)\n"
       << "  echo \"=== Summarizing results ...\"\n"
-      << "  aliroot -l -b -q ${prefix}Summarize.C\\(" << mc << "\\)\n"
+      << "  aliroot -l -b -q ${prefix}Summarize.C\\($mc\\)\n"
       << "  if test x$dest = x ; then return ; fi\n"
       << "  echo \"=== Uploading to ${dest} ...\"\n"
       << "  aliroot -l -b -q Upload.C\\(\\\"${dest}\\\"\\);\n"

diff --git a/PWGLF/FORWARD/analysis2/trains/MakeMCCorrTrain.C b/PWGLF/FORWARD/analysis2/trains/MakeMCCorrTrain.C
index 7bd4ae7d37cf921b19b48eb21fda1aab0d763092..1df18ff63f8b42f672976149ec34558220894539 100644 (file)
--- a/PWGLF/FORWARD/analysis2/trains/MakeMCCorrTrain.C
+++ b/PWGLF/FORWARD/analysis2/trains/MakeMCCorrTrain.C
@@ -114,6 +114,7 @@ protected:
 
     SaveExtract();
     SaveSummarize();
+    SaveDraw();
   }
   void SaveExtract()
   {
@@ -154,7 +155,7 @@ protected:
       << "//   0x200     Pause\n"
       << "//\n"
       << "void Summarize(const char* filename=\"forward_mccorr.root\",\n"
-      << "               UShort_t what=0x1F)\n"
+      << "               UShort_t what=0x11F)\n"
       << "{\n"
       << "  const char* fwd=\"$ALICE_ROOT/PWGLF/FORWARD/analysis2\";\n"
       << "  gROOT->LoadMacro(Form(\"%s/DrawMCCorrSummary.C\",fwd));\n"
@@ -163,12 +164,44 @@ protected:
       << "// EOF" << std::endl;
     f.close();
   }
+  /** 
+   * Write a ROOT script to draw overview
+   * 
+   */
+  void SaveDraw()
+  {
+    std::ofstream f("Draw.C");
+    if (!f) { 
+      Error("SaveDraw", "Failed to open Draw.C script");
+      return;
+    }
+    f << "// Generated by " << ClassName() << "\n"
+      << "// WHAT is a bit mask of\n"
+      << "//   0x001     Event inspector\n"
+      << "//   0x002     Track density\n"
+      << "//   0x004     Vertex bins\n"
+      << "//   0x008     Results\n"
+      << "//   0x080     Central\n"
+      << "//   0x100     Landscape\n"
+      << "//   0x200     Pause\n"
+      << "//\n"
+      << "void Draw(bool details=false)\n"
+      << "{\n"
+      << "  const char* fwd=\"$ALICE_ROOT/PWGLF/FORWARD/analysis2\";\n"
+      << "  gROOT->LoadMacro(Form(\"%s/corrs/DrawCorrSecMap.C\",fwd));\n"
+      << "  DrawCorrSecMap(999,0,0,999,\"fmd_corrections.root\",details);\n"
+      << "}\n"
+      << "// EOF" << std::endl;
+    f.close();
+  }
   void PostShellCode(std::ostream& f)
   {
     f << "  echo \"=== Extracting Corrections ...\"\n"
       << "  aliroot -l -b -q ${prefix}Extract.C\n"
       << "  echo \"=== Summarizing results ...\"\n"
       << "  aliroot -l -b -q ${prefix}Summarize.C\n"
+      << "  echo \"=== Draw results ...\"\n"
+      << "  aliroot -l -b -q ${prefix}Draw.C\n"
       << "  if test x$dest = x ; then return ; fi\n"
       << "  echo \"=== Uploading to ${dest} ...\"\n"
       << "  aliroot -l -b -q Upload.C\\(\\\"${dest}\\\"\\);"

diff --git a/PWGLF/FORWARD/analysis2/trains/MakedNdetaTrain.C b/PWGLF/FORWARD/analysis2/trains/MakedNdetaTrain.C
index 243c3746e59632a72a13b80aa783df147df92b70..9181c9d2b4a6ba5b562616cbb252a7668609ec2b 100644 (file)
--- a/PWGLF/FORWARD/analysis2/trains/MakedNdetaTrain.C
+++ b/PWGLF/FORWARD/analysis2/trains/MakedNdetaTrain.C
@@ -73,6 +73,7 @@ protected:
     Bool_t   mc      = fOptions.Has("mc");
     TString  mccorr  = fOptions.AsString("mc-corr", "");
     Bool_t   satonly = fOptions.AsBool("satellite");
+    if (!mc) mc      = fHelper->IsMC(); 
 
     // --- Form arguments --------------------------------------------
     TString args;
@@ -179,7 +180,7 @@ protected:
     o << "void Draw(const TString& title=\"" << fName << "\",\n"
       << "          UShort_t       rebin=5,\n"
       << "          UShort_t       others=0xf,\n"
-      << "          UShort_t       flags=0xCE07,\n"
+      << "          UInt_t         flags=0x1CE07,\n"
       << "          UShort_t       sNN=0,\n"
       << "          UShort_t       sys=0,\n"
       << "          UShort_t       trg=0,\n"