Changes in / [c1780a5:b03c0d0] in git

Files:

• Makefile (modified) (6 diffs)
• cards/delphes_card_MuonColliderDet.tcl (modified) (1 diff)
• classes/DelphesHepMC2Reader.cc (deleted)
• classes/DelphesHepMC2Reader.h (deleted)
• classes/DelphesHepMC3Reader.cc (deleted)
• classes/DelphesHepMC3Reader.h (deleted)
• classes/DelphesHepMCReader.cc (added)
• classes/DelphesHepMCReader.h (added)
• classes/DelphesStream.cc (modified) (1 diff)
• classes/DelphesStream.h (modified) (1 diff)
• converters/hepmc2pileup.cpp (modified) (3 diffs)
• doc/genMakefile.tcl (modified) (1 diff)
• readers/DelphesHepMC.cpp (added)
• readers/DelphesHepMC2.cpp (deleted)
• readers/DelphesHepMC3.cpp (deleted)

Makefile

@@ -103 +103 @@
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
-        classes/DelphesHepMC2Reader.h \
+        classes/DelphesHepMCReader.h \
         classes/DelphesPileUpWriter.h \
         external/ExRootAnalysis/ExRootProgressBar.h \
@@ -213 +213 @@
         tmp/validation/DelphesValidation.$(ObjSuf)
 
-DelphesHepMC2$(ExeSuf): \
-        tmp/readers/DelphesHepMC2.$(ObjSuf)
-
-tmp/readers/DelphesHepMC2.$(ObjSuf): \
-        readers/DelphesHepMC2.cpp \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesHepMC2Reader.h \
-        modules/Delphes.h \
-        external/ExRootAnalysis/ExRootProgressBar.h \
-        external/ExRootAnalysis/ExRootTreeBranch.h \
-        external/ExRootAnalysis/ExRootTreeWriter.h
-DelphesHepMC3$(ExeSuf): \
-        tmp/readers/DelphesHepMC3.$(ObjSuf)
-
-tmp/readers/DelphesHepMC3.$(ObjSuf): \
-        readers/DelphesHepMC3.cpp \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesHepMC3Reader.h \
+DelphesHepMC$(ExeSuf): \
+        tmp/readers/DelphesHepMC.$(ObjSuf)
+
+tmp/readers/DelphesHepMC.$(ObjSuf): \
+        readers/DelphesHepMC.cpp \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesHepMCReader.h \
         modules/Delphes.h \
         external/ExRootAnalysis/ExRootProgressBar.h \
@@ -275 +263 @@
         external/ExRootAnalysis/ExRootTreeWriter.h
 EXECUTABLE +=  \
-        DelphesHepMC2$(ExeSuf) \
-        DelphesHepMC3$(ExeSuf) \
+        DelphesHepMC$(ExeSuf) \
         DelphesLHEF$(ExeSuf) \
         DelphesROOT$(ExeSuf) \
@@ -282 +269 @@
 
 EXECUTABLE_OBJ +=  \
-        tmp/readers/DelphesHepMC2.$(ObjSuf) \
-        tmp/readers/DelphesHepMC3.$(ObjSuf) \
+        tmp/readers/DelphesHepMC.$(ObjSuf) \
         tmp/readers/DelphesLHEF.$(ObjSuf) \
         tmp/readers/DelphesROOT.$(ObjSuf) \
@@ -530 +516 @@
         classes/DelphesFormula.h \
         classes/DelphesClasses.h
-tmp/classes/DelphesHepMC2Reader.$(ObjSuf): \
-        classes/DelphesHepMC2Reader.$(SrcSuf) \
-        classes/DelphesHepMC2Reader.h \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesStream.h \
-        external/ExRootAnalysis/ExRootTreeBranch.h
-tmp/classes/DelphesHepMC3Reader.$(ObjSuf): \
-        classes/DelphesHepMC3Reader.$(SrcSuf) \
-        classes/DelphesHepMC3Reader.h \
+tmp/classes/DelphesHepMCReader.$(ObjSuf): \
+        classes/DelphesHepMCReader.$(SrcSuf) \
+        classes/DelphesHepMCReader.h \
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
@@ -1166 +1145 @@
         tmp/classes/DelphesFactory.$(ObjSuf) \
         tmp/classes/DelphesFormula.$(ObjSuf) \
-        tmp/classes/DelphesHepMC2Reader.$(ObjSuf) \
-        tmp/classes/DelphesHepMC3Reader.$(ObjSuf) \
+        tmp/classes/DelphesHepMCReader.$(ObjSuf) \
         tmp/classes/DelphesLHEFReader.$(ObjSuf) \
         tmp/classes/DelphesModule.$(ObjSuf) \

cards/delphes_card_MuonColliderDet.tcl

@@ -1200 +1200 @@
     set ResolutionFormula {
         (abs(eta) <= 0.78 )  * sqrt(energy^2*0.01^2 + energy*0.156^2)+
-        (abs(eta) > 0.78 && abs(eta) <=0.83 ) * sqrt( energy^2*0.01^2 + energy*0.175^2  ) +
+        (abs(eta) > 0.78 && abs(eta) <=0.83 ) * sqrt( energy^0.01^2 + energy*0.175^2  ) +
         (abs(eta) <= 2.5 && abs(eta) > 0.83) * sqrt( energy^2*0.01^2 + energy*0.151^2  )}
 }

classes/DelphesStream.cc

@@ -106 +106 @@
 
 //------------------------------------------------------------------------------
-
-bool DelphesStream::FindChr(int value)
-{
-  char *position;
-  bool result = false;
-
-  position = strchr(fBuffer, value);
-
-  if(position)
-  {
-    result = true;
-    fBuffer = position + 1;
-  }
-
-  return result;
-}
-
-//------------------------------------------------------------------------------
-
-bool DelphesStream::FindStr(const char *value)
-{
-  char *position;
-  bool result = false;
-
-  position = strstr(fBuffer, value);
-
-  if(position)
-  {
-    result = true;
-    fBuffer = position + strlen(value);
-  }
-
-  return result;
-}
-
-//------------------------------------------------------------------------------

classes/DelphesStream.h

@@ -35 +35 @@
   bool ReadDbl(double &value);
   bool ReadInt(int &value);
-  bool FindChr(int value);
-  bool FindStr(const char *value);
 
 private:

converters/hepmc2pileup.cpp

@@ -35 +35 @@
 #include "classes/DelphesClasses.h"
 #include "classes/DelphesFactory.h"
-#include "classes/DelphesHepMC2Reader.h"
+#include "classes/DelphesHepMCReader.h"
 #include "classes/DelphesPileUpWriter.h"
 
@@ -65 +65 @@
   Candidate *candidate = 0;
   DelphesPileUpWriter *writer = 0;
-  DelphesHepMC2Reader *reader = 0;
+  DelphesHepMCReader *reader = 0;
   Int_t i;
   Long64_t length, eventCounter;
@@ -98 +98 @@
     itParticle = stableParticleOutputArray->MakeIterator();
 
-    reader = new DelphesHepMC2Reader;
+    reader = new DelphesHepMCReader;
 
     i = 2;

doc/genMakefile.tcl

@@ -292 +292 @@
 executableDeps {converters/*.cpp} {examples/*.cpp} {validation/*.cpp}
 
-executableDeps {readers/DelphesHepMC2.cpp} {readers/DelphesHepMC3.cpp} {readers/DelphesLHEF.cpp} {readers/DelphesSTDHEP.cpp} {readers/DelphesROOT.cpp}
+executableDeps {readers/DelphesHepMC.cpp} {readers/DelphesLHEF.cpp} {readers/DelphesSTDHEP.cpp} {readers/DelphesROOT.cpp}
 
 puts {ifeq ($(HAS_CMSSW),true)}