fix for on the fly MC generation

diff --git a/ANALYSIS/AliAnalysisTaskBaseLine.cxx b/ANALYSIS/AliAnalysisTaskBaseLine.cxx
index e3f5dac613193c414acd0c4d48c18fcbb6a67cc4..e2b57da44b1773ecd8b015115fd5acab9096b52e 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskBaseLine.cxx
+++ b/ANALYSIS/AliAnalysisTaskBaseLine.cxx
@@ -29,18 +29,22 @@ ClassImp(AliAnalysisTaskBaseLine)
 AliAnalysisTaskBaseLine::AliAnalysisTaskBaseLine() 
    :AliAnalysisTaskSE()
 {
+  // constructor
 }
 
 AliAnalysisTaskBaseLine::AliAnalysisTaskBaseLine(const char *name)
    :AliAnalysisTaskSE(name)
 {
+  // constructor
   DefineInput(0, TChain::Class());
 }
 
 AliAnalysisTaskBaseLine::~AliAnalysisTaskBaseLine()
 {
+   // destructor
 }
 
 void AliAnalysisTaskBaseLine::UserExec(Option_t *) 
 {
+  // empty exec
 }

diff --git a/ANALYSIS/AliAnalysisTaskSE.cxx b/ANALYSIS/AliAnalysisTaskSE.cxx
index e957dad1413a10b72056372a2026da87f0ee4123..58c62d68f2ad7a7074cad084994717129e52077b 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskSE.cxx
+++ b/ANALYSIS/AliAnalysisTaskSE.cxx
@@ -177,8 +177,8 @@ void AliAnalysisTaskSE::ConnectInputData(Option_t* /*option*/)
    // Connect input handlers (multi input handler is handled)
     ConnectMultiHandler();
     
-    if (fInputHandler) {
-       if ((fInputHandler->GetTree())->GetBranch("ESDfriend."))
+    if (fInputHandler && fInputHandler->GetTree()) {
+       if (fInputHandler->GetTree()->GetBranch("ESDfriend."))
            fESDfriend = ((AliESDInputHandler*)fInputHandler)->GetESDfriend();
 
        fInputEvent = fInputHandler->GetEvent();

diff --git a/STEER/STEER/AliMCGenHandler.cxx b/STEER/STEER/AliMCGenHandler.cxx
index 1ac1cd8e72750328d754111921d6daa06af5d476..c645abed1827ab88b276c1b366bda091d2ca60fb 100644 (file)
--- a/STEER/STEER/AliMCGenHandler.cxx
+++ b/STEER/STEER/AliMCGenHandler.cxx
@@ -43,7 +43,8 @@ AliMCGenHandler::AliMCGenHandler() :
     fStack(0),
     fHeader(0),
     fGenerator(0),
-    fSeedMode(0)
+    fSeedMode(0),
+    fSeed(0)
 {
   //
   // Default constructor
@@ -59,7 +60,8 @@ AliMCGenHandler::AliMCGenHandler(const char* name, const char* title) :
     fStack(0),
     fHeader(0),
     fGenerator(0),
-    fSeedMode(0)
+    fSeedMode(0),
+    fSeed(0)
 {
   //
   // Constructor
@@ -85,22 +87,31 @@ Bool_t AliMCGenHandler::Init(Option_t* /*opt*/)
     
     if (fSeedMode == 0)
       Printf("AliMCGenHandler::Init: Not setting any seed. Seed needs to be set externally!");
-    else if (fSeedMode == 1)
-    {
-      Printf("AliMCGenHandler::Init: Taking seed from current time");
-      gRandom->SetSeed(time(0));
-    }
-    else if (fSeedMode == 2)
+    else
     {
-      Printf("AliMCGenHandler::Init: Taking seed from AliEn job id");
-      TString tmp(gSystem->Getenv("ALIEN_PROC_ID"));
-      UInt_t seed = tmp.Atoi();
-      if (tmp.Length() == 0 || seed == 0)
-       AliFatal(Form("Could not retrieve AliEn job id for seed. The variable ALIEN_PROC_ID contains %s", tmp.Data()));
-      gRandom->SetSeed(seed);
+      if (fSeedMode == 1)
+      {
+       Printf("AliMCGenHandler::Init: Using manually set seed");
+      }
+      else if (fSeedMode == 2)
+      {
+       Printf("AliMCGenHandler::Init: Taking seed from current time");
+       fSeed = time(0);
+      }
+      else if (fSeedMode == 3)
+      {
+       Printf("AliMCGenHandler::Init: Taking seed from AliEn job id");
+       TString tmp(gSystem->Getenv("ALIEN_PROC_ID"));
+       fSeed = tmp.Atoi();
+       if (tmp.Length() == 0 || fSeed == 0)
+         AliFatal(Form("Could not retrieve AliEn job id for seed. The variable ALIEN_PROC_ID contains %s", tmp.Data()));
+      }
+      else
+       AliFatal(Form("Seed mode %d unknown", fSeedMode));
+
+      Printf("AliMCGenHandler::Init: Using seed: %d", fSeed);
+      gRandom->SetSeed(fSeed);
     }
-    else
-      AliFatal(Form("Seed mode %d unknown", fSeedMode));
 
     AliRunLoader* rl = AliRunLoader::Open("galice.root","FASTRUN","recreate");
     rl->MakeTree("E");

diff --git a/STEER/STEER/AliMCGenHandler.h b/STEER/STEER/AliMCGenHandler.h
index a8be27302380eba874f4161963b19f7d3678a425..274bbc5c3af6da6a510634713846c5b7d2a376b6 100644 (file)
--- a/STEER/STEER/AliMCGenHandler.h
+++ b/STEER/STEER/AliMCGenHandler.h
@@ -41,6 +41,8 @@ public:
     
     void                SetGenerator(AliGenerator* generator) { fGenerator = generator; }
     void                SetSeedMode(Int_t mode) { fSeedMode = mode; }
+    void                SetSeed(UInt_t seed) { fSeed = seed; }
+    UInt_t              GetSeed() { return fSeed; }
 
 private:
     AliMCGenHandler(const AliMCGenHandler& handler);             
@@ -52,7 +54,8 @@ private:
     AliHeader*            fHeader;             //! current AliHeader pointer
 
     AliGenerator         *fGenerator;          // generator
-    Int_t                 fSeedMode;           // which seed is to be used: 0 (default): nothing/set externally; 1: current time; 2: AliEn job id
+    Int_t                 fSeedMode;           // which seed is to be used: 0 (default): nothing/set externally; 1: use fSeed; 2: current time; 3: AliEn job id
+    UInt_t                fSeed;               // can be used to set seed manually (fSeedMode == 1); contains last used seed (fSeedMode == 2 || 3)
 
     ClassDef(AliMCGenHandler,1)  // MC Gen Handler
 };

diff --git a/STEER/STEERBase/AliDummyHandler.h b/STEER/STEERBase/AliDummyHandler.h
index f48a54a0966688e917f6b3ce605a3683ae522b17..37996ea9e017ba4d0e632f56903791e3a5f52fd6 100644 (file)
--- a/STEER/STEERBase/AliDummyHandler.h
+++ b/STEER/STEERBase/AliDummyHandler.h
@@ -18,6 +18,8 @@ class AliDummyHandler : public AliInputEventHandler {
     AliDummyHandler();
     AliDummyHandler(const char* name, const char* title);
     virtual ~AliDummyHandler();
+    virtual Bool_t       Init(Option_t* opt) { return AliInputEventHandler::Init(opt); }
+    virtual Bool_t Init(TTree* tree, Option_t* /*opt*/) { fTree = tree; return kTRUE; }
     Option_t            *GetDataType() const { return "MC"; }
 
  private: