Changeset 1175 in svn for trunk/modules

Timestamp:

Jul 4, 2013, 1:03:09 PM (11 years ago)

Author:

Pavel Demin

Message:

add Pythia config file to PileUpMergerPythia8

Location:

trunk/modules

Files:

• PileUpMergerPythia8.cc (modified) (1 diff)
• PileUpMergerPythia8.h (modified) (1 diff)

trunk/modules/PileUpMergerPythia8.cc

@@ -57 +57 @@
 void PileUpMergerPythia8::Init()
 {
+  const char *fileName;
+
   fMeanPileUp  = GetDouble("MeanPileUp", 10);
   fZVertexSpread = GetDouble("ZVertexSpread", 0.05)*1.0E3;
 
-  fCMEnergy = GetDouble("CMEnergy", 14000.0);
-  fPTMin = GetDouble("PTMin", 0.5);
+  fPTMin = GetDouble("PTMin", 0.0);
 
-  fRandomSeed = GetInt("RandomSeed", 1);
-  fBeamAID = GetInt("BeamAID", 2212);
-  fBeamBID = GetInt("BeamBID", 2212);
-
-  // Pythia8 pile-up initialization
+  fileName = GetString("ConfigFile", "MinBias.cmnd");
   fPythia = new Pythia8::Pythia();
-  fPythia->readString("SoftQCD:minBias = on");
-  fPythia->init(fBeamAID, fBeamBID, fCMEnergy);
-  fPythia->rndm.init(fRandomSeed);
+  fPythia->readFile(fileName);
 
   // import input array

trunk/modules/PileUpMergerPythia8.h

@@ -39 +39 @@
   Double_t fMeanPileUp;
   Double_t fZVertexSpread;
-  Double_t fCMEnergy;
   Double_t fPTMin;
-
-  Int_t fRandomSeed;
-  Int_t fBeamAID;
-  Int_t fBeamBID;
 
   Pythia8::Pythia *fPythia; //!