Changeset 450 in svn for trunk/src

Timestamp:

Jul 3, 2009, 6:14:36 PM (16 years ago)

Author:

Xavier Rouby

Message:

lhe bug (empty Analysis tree) solved

File:

• trunk/src/LHEFConverter.cc (modified) (5 diffs)

trunk/src/LHEFConverter.cc

@@ -80 +80 @@
     element->PID = hepeup.IDUP[particle];
     element->Status = hepeup.ISTUP[particle];
-    element->Mother1 = hepeup.MOTHUP[particle].first;
-    element->Mother2 = hepeup.MOTHUP[particle].second;
+    element->M1 = hepeup.MOTHUP[particle].first;
+    element->M2 = hepeup.MOTHUP[particle].second;
+    element->D1 = 0;
+    element->D2 = 0;
     element->ColorLine1 = hepeup.ICOLUP[particle].first;
     element->ColorLine2 = hepeup.ICOLUP[particle].second;
@@ -107 +109 @@
 }
 
+
+//---------------------------------------------------------------------------
+/*
+void LHEFConverter::AnalyseParticles(LHEF::Reader *reader, ExRootTreeBranch *branch)
+{
+  const LHEF::HEPEUP &hepeup = reader->hepeup;
+  Double_t signPz;
+  TLorentzVector momentum;
+  TRootC::GenParticle *element;
+
+  for(Int_t particle = 0; particle < hepeup.NUP; ++particle)
+  {
+    element = (TRootC::GenParticle*) branch->NewEntry();
+
+    element->PID = hepeup.IDUP[particle];
+    element->Status = hepeup.ISTUP[particle];
+    element->M1 = hepeup.MOTHUP[particle].first;
+    element->M2 = hepeup.MOTHUP[particle].second;
+    //element->ColorLine1 = hepeup.ICOLUP[particle].first;
+    //element->ColorLine2 = hepeup.ICOLUP[particle].second;
+    element->D1 = 0;
+    element->D2 = 0;
+
+    PdgParticle pdg_part = pdg_table[element->PID];
+    element->Charge = pdg_part.charge();
+    element->M = pdg_part.mass();
+    //element->Charge = ChargeVal(element->PID);
+    //element->M = hepeup.PUP[particle][4];
+
+    element->E = hepeup.PUP[particle][3];
+    element->Px = hepeup.PUP[particle][0];
+    element->Py = hepeup.PUP[particle][1];
+    element->Pz = hepeup.PUP[particle][2];
+
+    momentum.SetPxPyPzE(element->Px, element->Py, element->Pz, element->E);
+    element->PT = momentum.Perp();
+    signPz = (element->Pz >= 0.0) ? 1.0 : -1.0;
+    //element->Eta = element->PT == 0.0 ? signPz*999.9 : momentum.Eta(); to avoid a warning from ROOT, replace the "==0" by "< 1e-6"
+    element->Eta = element->PT < 1E-6 ? signPz*999.9 : momentum.Eta();
+    element->Phi = momentum.Phi();
+//    element->Rapidity = element->PT < 1E-6 ? signPz*999.9 : momentum.Rapidity();
+//    element->LifeTime = hepeup.VTIMUP[particle];
+//    element->Spin = hepeup.SPINUP[particle];
+  }
+}
+*/
+
 LHEFConverter::~LHEFConverter()
 {
@@ -112 +161 @@
 
 //------------------------------------------------------------------------------
-LHEFConverter::LHEFConverter(const string& inputFileList, const string& outputFileName, const PdgTable& pdg, const int& Nevents) :
- DataConverter(pdg,Nevents) {
+LHEFConverter::LHEFConverter(const string& inputFileList, const string& outputFileName, const PdgTable& pdg, const int& Nevents) : DataConverter(pdg,Nevents) {
 
   ExRootTreeWriter *treeWriter = new ExRootTreeWriter(outputFileName, "GEN");
@@ -122 +170 @@
   // generated partons from LHEF
   ExRootTreeBranch *branchParticle = treeWriter->NewBranch("Particle", TRootLHEFParticle::Class());
+  //ExRootTreeBranch *branchParticle = treeWriter->NewBranch("Particle", TRootC::GenParticle::Class());
   
   // Open a stream connected to an event file:
@@ -167 +216 @@
   }
   treeWriter->Write();
-  
-  
   delete treeWriter;
   //delete inputReader;