Changeset c1780a5 in git for classes

Timestamp:

May 26, 2021, 4:48:19 PM (3 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

master

Children:

c6f9311

Parents:

b03c0d0 (diff), b4786d3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/delphes/delphes

Location:

classes

Files:

• DelphesHepMC2Reader.cc (moved) (moved from classes/DelphesHepMCReader.cc ) (13 diffs)
• DelphesHepMC2Reader.h (moved) (moved from classes/DelphesHepMCReader.h ) (3 diffs)
• DelphesHepMC3Reader.cc (added)
• DelphesHepMC3Reader.h (added)
• DelphesStream.cc (modified) (1 diff)
• DelphesStream.h (modified) (1 diff)

classes/DelphesHepMC2Reader.cc

@@ -17 +17 @@
  */
 
-/** \class DelphesHepMCReader
+/** \class DelphesHepMC2Reader
  *
  *  Reads HepMC file
@@ -25 +25 @@
  */
 
-#include "classes/DelphesHepMCReader.h"
+#include "classes/DelphesHepMC2Reader.h"
 
 #include <iostream>
@@ -54 +54 @@
 //---------------------------------------------------------------------------
 
-DelphesHepMCReader::DelphesHepMCReader() :
+DelphesHepMC2Reader::DelphesHepMC2Reader() :
   fInputFile(0), fBuffer(0), fPDG(0),
   fVertexCounter(-1), fInCounter(-1), fOutCounter(-1),
@@ -66 +66 @@
 //---------------------------------------------------------------------------
 
-DelphesHepMCReader::~DelphesHepMCReader()
+DelphesHepMC2Reader::~DelphesHepMC2Reader()
 {
   if(fBuffer) delete[] fBuffer;
@@ -73 +73 @@
 //---------------------------------------------------------------------------
 
-void DelphesHepMCReader::SetInputFile(FILE *inputFile)
+void DelphesHepMC2Reader::SetInputFile(FILE *inputFile)
 {
   fInputFile = inputFile;
@@ -80 +80 @@
 //---------------------------------------------------------------------------
 
-void DelphesHepMCReader::Clear()
+void DelphesHepMC2Reader::Clear()
 {
   fStateSize = 0;
@@ -98 +98 @@
 //---------------------------------------------------------------------------
 
-bool DelphesHepMCReader::EventReady()
+bool DelphesHepMC2Reader::EventReady()
 {
   return (fVertexCounter == 0) && (fInCounter == 0) && (fOutCounter == 0);
@@ -105 +105 @@
 //---------------------------------------------------------------------------
 
-bool DelphesHepMCReader::ReadBlock(DelphesFactory *factory,
+bool DelphesHepMC2Reader::ReadBlock(DelphesFactory *factory,
   TObjArray *allParticleOutputArray,
   TObjArray *stableParticleOutputArray,
@@ -202 +202 @@
     }
   }
-
   else if(key == 'C')
   {
     rc = bufferStream.ReadDbl(fCrossSection)
       && bufferStream.ReadDbl(fCrossSectionError);
-  }
-
+
+    if(!rc)
+    {
+      cerr << "** ERROR: "
+           << "invalid cross section format" << endl;
+      return kFALSE;
+    }
+  }
   else if(key == 'F')
   {
@@ -317 +322 @@
 //---------------------------------------------------------------------------
 
-void DelphesHepMCReader::AnalyzeEvent(ExRootTreeBranch *branch, long long eventNumber,
+void DelphesHepMC2Reader::AnalyzeEvent(ExRootTreeBranch *branch, long long eventNumber,
   TStopwatch *readStopWatch, TStopwatch *procStopWatch)
 {
@@ -348 +353 @@
 //---------------------------------------------------------------------------
 
-void DelphesHepMCReader::AnalyzeWeight(ExRootTreeBranch *branch)
+void DelphesHepMC2Reader::AnalyzeWeight(ExRootTreeBranch *branch)
 {
   Weight *element;
@@ -363 +368 @@
 //---------------------------------------------------------------------------
 
-void DelphesHepMCReader::AnalyzeParticle(DelphesFactory *factory,
+void DelphesHepMC2Reader::AnalyzeParticle(DelphesFactory *factory,
   TObjArray *allParticleOutputArray,
   TObjArray *stableParticleOutputArray,
@@ -430 +435 @@
 //---------------------------------------------------------------------------
 
-void DelphesHepMCReader::FinalizeParticles(TObjArray *allParticleOutputArray)
+void DelphesHepMC2Reader::FinalizeParticles(TObjArray *allParticleOutputArray)
 {
   Candidate *candidate;

classes/DelphesHepMC2Reader.h

@@ -17 +17 @@
  */
 
-#ifndef DelphesHepMCReader_h
-#define DelphesHepMCReader_h
+#ifndef DelphesHepMC2Reader_h
+#define DelphesHepMC2Reader_h
 
-/** \class DelphesHepMCReader
+/** \class DelphesHepMC2Reader
  *
  *  Reads HepMC file
@@ -39 +39 @@
 class DelphesFactory;
 
-class DelphesHepMCReader
+class DelphesHepMC2Reader
 {
 public:
-  DelphesHepMCReader();
-  ~DelphesHepMCReader();
+  DelphesHepMC2Reader();
+  ~DelphesHepMC2Reader();
 
   void SetInputFile(FILE *inputFile);
@@ -102 +102 @@
 };
 
-#endif // DelphesHepMCReader_h
+#endif // DelphesHepMC2Reader_h

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: