Changeset 380 in svn for trunk/interface

Timestamp:

May 12, 2009, 9:47:12 AM (16 years ago)

Author:

Xavier Rouby

Message:

new PDG table

Location:

trunk/interface

Files:

• DataConverter.h (modified) (2 diffs)
• HEPEVTConverter.h (modified) (1 diff)
• HepMCConverter.h (modified) (1 diff)
• LHEFConverter.h (modified) (1 diff)
• STDHEPConverter.h (modified) (1 diff)
• SmearUtil.h (modified) (3 diffs)

trunk/interface/DataConverter.h

@@ -38 +38 @@
 #include <string>
 
+#include "PdgParticle.h"
 #include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
 #include "Utilities/ExRootAnalysis/interface/LHEF.h"
@@ -48 +49 @@
 
   DataConverter() : Nevt(-1) {};
-  DataConverter(const int &N) : Nevt(N) {};
+  DataConverter(const PdgTable& table, const int &N) : Nevt(N), pdg_table(table) {};
   virtual ~DataConverter() {};
 
 private:
   int Nevt; // number of events to read; -1 means "all of them"
+
+public: 
+  PdgTable pdg_table;   // table of particles from PDG
 };
 

trunk/interface/HEPEVTConverter.h

@@ -88 +88 @@
 public:
 
-  HEPEVTConverter(const string& inputFileList, const string& outputFileName, const int& Nevents=-1);
+  HEPEVTConverter(const string& inputFileList, const string& outputFileName, const PdgTable& pdg, const int& Nevents=-1);
 
 };

trunk/interface/HepMCConverter.h

@@ -46 +46 @@
 class HepMCConverter : public DataConverter {
   public:
-    HepMCConverter(const string& inputFileList, const string& outputFileName, const int& Nevents=-1);
+    HepMCConverter(const string& inputFileList, const string& outputFileName, const PdgTable& pdg, const int& Nevents=-1);
     virtual ~HepMCConverter();
 

trunk/interface/LHEFConverter.h

@@ -49 +49 @@
 public:
 
-  LHEFConverter(const string& inputFileList, const string& outputFileName, const int& Nevents=-1);
+  LHEFConverter(const string& inputFileList, const string& outputFileName, const PdgTable& pdg, const int& Nevents=-1);
   virtual ~LHEFConverter();
 

trunk/interface/STDHEPConverter.h

@@ -41 +41 @@
 class STDHEPConverter : public DataConverter {
   public:
-    STDHEPConverter(const string& inputFileList, const string& outputFileName, const int& Nevents=-1);
+    STDHEPConverter(const string& inputFileList, const string& outputFileName, const PdgTable& pdg, const int& Nevents=-1);
     virtual ~STDHEPConverter();
 

trunk/interface/SmearUtil.h

@@ -45 +45 @@
 #include "TSimpleArray.h"
 #include "PhysicsTower.hh"
+#include "PdgParticle.h"
 
 using namespace std;
@@ -213 +214 @@
  
  int NEvents_Frog;
-  float PT_QUARKS_MIN;    // minimal pt needed for quarks to reach the tracker, in GeV
+ float PT_QUARKS_MIN;    // minimal pt needed for quarks to reach the tracker, in GeV
+
+ string PdgTableFilename;
+ //map<int,PdgParticle> PdgTable;
+ PdgTable PDGtable;
 
   // to sort a vector
@@ -221 +226 @@
   /// Reads the data card for the initialisation of the parameters 
   void ReadDataCard(const string datacard);
+
+  /// Reads the PDG table
+  void ReadParticleDataGroupTable();
  
   /// Create the output log file