Changeset 59abd43 in git for classes

Timestamp:

May 1, 2013, 7:29:33 PM (12 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

9f6c8c4

Parents:

52db26b

Message:

add weight for HepMCEvent

Location:

classes

Files:

• DelphesClasses.h (modified) (1 diff)
• DelphesHepMCReader.cc (modified) (5 diffs)
• DelphesHepMCReader.h (modified) (2 diffs)

classes/DelphesClasses.h

@@ -77 +77 @@
   Int_t MPI; // number of multi parton interactions | mpi () 
 
+  Float_t Weight; // weight for the event
+
   Float_t Scale; // energy scale, see hep-ph/0109068 | event_scale()
   Float_t AlphaQED; // QED coupling, see hep-ph/0109068 | alphaQED()

classes/DelphesHepMCReader.cc

@@ -20 +20 @@
 
 #include <map>
+#include <vector>
 
 #include <stdio.h>
@@ -69 +70 @@
 void DelphesHepMCReader::Clear()
 {
+  fStateSize = 0;
+  fState.clear();
+  fWeightSize = 0;
+  fWeight.clear();
   fVertexCounter = -1;
   fInCounter = -1;
@@ -94 +99 @@
   map< int, pair< int, int > >::iterator itDaughterMap;
   char key;
-  int rc;
+  int i, rc, state;
+  double weight;
 
   if(!fgets(fBuffer, kBufferSize, fInputFile)) return kFALSE;
@@ -113 +119 @@
       && bufferStream.ReadInt(fProcessID)
       && bufferStream.ReadInt(fSignalCode)
-      && bufferStream.ReadInt(fVertexCounter);
+      && bufferStream.ReadInt(fVertexCounter)
+      && bufferStream.ReadInt(fBeamCode[0])
+      && bufferStream.ReadInt(fBeamCode[1])
+      && bufferStream.ReadInt(fStateSize);
+
+    if(!rc)
+    {
+      cerr << "** ERROR: " << "invalid event format" << endl;
+      return kFALSE;
+    }
+
+    for(i = 0; i < fStateSize; ++i)
+    {
+      rc = rc && bufferStream.ReadInt(state);
+      fState.push_back(state);
+    }
+
+    rc = rc && bufferStream.ReadInt(fWeightSize);
+
+    if(!rc)
+    {
+      cerr << "** ERROR: " << "invalid event format" << endl;
+      return kFALSE;
+    }
+
+    for(i = 0; i < fWeightSize; ++i)
+    {
+      rc = rc && bufferStream.ReadDbl(weight);
+      fWeight.push_back(weight);
+    }
 
     if(!rc)
@@ -236 +271 @@
   element->ProcessID = fProcessID;
   element->MPI = fMPI;
+  element->Weight = fWeight.size() > 0 ? fWeight[0] : 1.0;
   element->Scale = fScale;
   element->AlphaQED = fAlphaQED;

classes/DelphesHepMCReader.h

@@ -16 +16 @@
 
 #include <map>
+#include <vector>
 
 #include <stdio.h>
@@ -60 +61 @@
   TDatabasePDG *fPDG;
 
-  int fEventNumber, fMPI, fProcessID, fSignalCode, fVertexCounter;
+  int fEventNumber, fMPI, fProcessID, fSignalCode, fVertexCounter, fBeamCode[2];
   double fScale, fAlphaQCD, fAlphaQED;
+
+  int fStateSize;
+  std::vector< int > fState;
+
+  int fWeightSize;
+  std::vector< double > fWeight;
 
   int fID1, fID2;