From: saiola Date: Sat, 5 Jul 2014 02:39:28 +0000 (-0400) Subject: update default values and hard coded LHC11h semi good runs X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=245f5c0fc0d6cd916cdeefe6954c97f76788a966 update default values and hard coded LHC11h semi good runs --- diff --git a/PWGJE/EMCALJetTasks/AliJetEmbeddingFromPYTHIATask.cxx b/PWGJE/EMCALJetTasks/AliJetEmbeddingFromPYTHIATask.cxx index b66f00bd4d3..d22f676d434 100644 --- a/PWGJE/EMCALJetTasks/AliJetEmbeddingFromPYTHIATask.cxx +++ b/PWGJE/EMCALJetTasks/AliJetEmbeddingFromPYTHIATask.cxx @@ -37,7 +37,7 @@ AliJetEmbeddingFromPYTHIATask::AliJetEmbeddingFromPYTHIATask() : { // Default constructor. SetSuffix("PYTHIAEmbedding"); - fTotalFiles = 2000; + fTotalFiles = 140; fRandomAccess = kTRUE; SetAODMC(kTRUE); } @@ -45,7 +45,7 @@ AliJetEmbeddingFromPYTHIATask::AliJetEmbeddingFromPYTHIATask() : //________________________________________________________________________ AliJetEmbeddingFromPYTHIATask::AliJetEmbeddingFromPYTHIATask(const char *name, Bool_t drawqa) : AliJetEmbeddingFromAODTask(name, drawqa), - fPYTHIAPath("/alice/sim/2012/LHC12a15e"), + fPYTHIAPath("alien:///alice/sim/2012/LHC12a15e_fix/%d/%d/AOD149/%04d/AliAOD.root"), fPtHardBinScaling(), fLHC11hAnchorRun(kTRUE), fAnchorRun(-1), @@ -58,7 +58,7 @@ AliJetEmbeddingFromPYTHIATask::AliJetEmbeddingFromPYTHIATask(const char *name, B { // Standard constructor. SetSuffix("PYTHIAEmbedding"); - fTotalFiles = 2000; + fTotalFiles = 140; fRandomAccess = kTRUE; SetAODMC(kTRUE); } @@ -180,14 +180,15 @@ Bool_t AliJetEmbeddingFromPYTHIATask::UserNotify() Int_t runNumber = InputEvent()->GetRunNumber(); - Int_t semiGoodRunList[28] = {169975, 169981, 170038, 170040, 170083, 170084, 170085, 170088, - 170089, 170091, 170152, 170155, 170159, 170163, 170193, 170195, - 170203, 170204, 170205, 170228, 170230, 170264, 170268, 170269, - 170270, 170306, 170308, 170309}; + Int_t semiGoodRunList[32] = {169975, 169981, 170038, 170040, 170083, 170084, 170085, + 170088, 170089, 170091, 170152, 170155, 170159, 170163, + 170193, 170195, 170203, 170204, 170228, 170230, 170268, + 170269, 170270, 170306, 170308, 170309, 169238, 169160, + 169156, 169148, 169145, 169144}; fAnchorRun = 169838; // Assume it is a good run - for (Int_t i = 0; i < 28; i++) { + for (Int_t i = 0; i < 32; i++) { if (runNumber == semiGoodRunList[i]) { // If it is semi good, change the anchor run fAnchorRun = 170040; break; diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromPYTHIA.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromPYTHIA.C index 1a0be51bbf2..13f6cd0b87d 100644 --- a/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromPYTHIA.C +++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromPYTHIA.C @@ -7,7 +7,7 @@ AliJetEmbeddingFromPYTHIATask* AddTaskJetEmbeddingFromPYTHIA( const char *clusName = "", const char *cellsName = "EMCALCells", const char *MCPartName = "", - const char *simpath = "/alice/sim/2012/LHC12a15e", + const char *simpath = "alien:///alice/sim/2012/LHC12a15e_fix/%d/%d/AOD141/%04d/AliAOD.root", Int_t nPtHard = 11, Double_t *ptHardScaling = 0, const char *aodTreeName = "aodTree", @@ -21,7 +21,7 @@ AliJetEmbeddingFromPYTHIATask* AddTaskJetEmbeddingFromPYTHIA( Double_t maxCent = -1, UInt_t mask = AliVEvent::kAny, Double_t minJetPt = 0, - const Bool_t copyArray = kTRUE, + const Bool_t copyArray = kFALSE, const Bool_t makeQA = kFALSE, const char *fileTable = "", const char *taskName = "JetEmbeddingFromPYTHIATask"