]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Set merged output as variable Indeed, it depends on the compact mode.
authordstocco <diego.stocco@cern.ch>
Wed, 17 Dec 2014 19:28:28 +0000 (20:28 +0100)
committerlaphecet <laurent.aphecetche@subatech.in2p3.fr>
Mon, 12 Jan 2015 14:58:04 +0000 (15:58 +0100)
PWG/muondep/AccEffTemplates/AODtrainsim.C
PWG/muondep/AliMuonAccEffSubmitter.cxx

index f23585e7882b745d261a9c45e46d8ce0cd6d674a..60800621573efa9a028a8405fbd85c75b23e750b 100644 (file)
@@ -442,7 +442,7 @@ void AODmerge()
   TStopwatch timer;
   timer.Start();
   TString outputDir = "wn.xml";
-  TString outputFiles = "AliAOD.root,AliAOD.Muons.root";
+  TString outputFiles = VAR_AOD_MERGE_FILES;
   TString mergeExcludes = "";
   TObjArray *list = outputFiles.Tokenize(",");
   TIter *iter = new TIter(list);
index 91ad0497ae0c67f2fa19fd3a1204cf967b7ef1fb..c7b1d3aa8577eb51bb716233dbbec0199cc6495d 100644 (file)
@@ -148,6 +148,7 @@ fUseAODMerging(kFALSE)
   SetLocalDirectory("Snapshot",LocalDir());
   
   SetVar("VAR_OCDB_PATH",Form("\"%s\"",ocdbPath.Data()));
+  SetVar("VAR_AOD_MERGE_FILES","\"AliAOD.root,AliAOD.Muons.root\"");
 
   SetVar("VAR_GENPARAM_INCLUDE","AliGenMUONlib.h");
   SetVar("VAR_GENPARAM_NPART","1");
@@ -757,6 +758,8 @@ Bool_t AliMuonAccEffSubmitter::Run(const char* mode)
   
   if (!IsValid()) return kFALSE;
   
+  if ( fCompactMode == 1 ) SetVar("VAR_AOD_MERGE_FILES","\"AliAOD.Muons.root\"");
+
   TString smode(mode);
   smode.ToUpper();