Changes in / [6bc0fd3:1d9c62a] in git

File:

• readers/DelphesProIO.cpp (modified) (7 diffs)

readers/DelphesProIO.cpp

@@ -57 +57 @@
 
 //---------------------------------------------------------------------------
-// This method dynamically checks the message type (varint or not) depending on
-// non-zero value of units momentumUnit and positionUnit.
-void ConvertInput(proio::Event *event, double momentumUnit, double positionUnit, 
+
+void ConvertInput(proio::Event *event, 
   ExRootTreeBranch *branch, DelphesFactory *factory,
   TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray,
@@ -77 +76 @@
   pdg = TDatabasePDG::Instance();
 
+
   // event information
   element = static_cast<HepMCEvent *>(branch->NewEntry());
+
 
  int nID=0;
@@ -98 +99 @@
 /*
   // Pythia8 specific
+  element->Number = mutableEvent->number();
+  element->ProcessID = mutableEvent->process_id();
   element->MPI = mutableEvent->mpi();
+  element->Weight = mutableEvent->weight();
   element->Scale = mutableEvent->scale();
   element->AlphaQED = mutableEvent->alpha_qed();
@@ -113 +117 @@
   element->ReadTime = readStopWatch->RealTime();
   element->ProcTime = procStopWatch->RealTime();
-
-
-
- if ( momentumUnit >0 && positionUnit>0) {
-
-
-  auto entries = event->TaggedEntries("VarintPackedParticles");
-
-  for (uint64_t entryID : entries) {
-
-    auto mutableParticles = dynamic_cast<model::VarintPackedParticles *>(event->GetEntry(entryID));
-
-    for(int i = 0; i < mutableParticles->pdg_size(); ++i)
-   {
-    pid = mutableParticles->pdg(i);
-    status = mutableParticles->status(i);
-    px = mutableParticles->px(i)/momentumUnit;
-    py = mutableParticles->py(i)/momentumUnit;
-    pz = mutableParticles->pz(i)/momentumUnit;
-    mass = mutableParticles->mass(i)/momentumUnit;
-    x = mutableParticles->x(i)/positionUnit;
-    y = mutableParticles->y(i)/positionUnit;
-    z = mutableParticles->z(i)/positionUnit;
-    t = mutableParticles->t(i)/positionUnit;
-    
-    candidate = factory->NewCandidate();
-    candidate->PID = pid;
-    pdgCode = TMath::Abs(candidate->PID);
-    candidate->Status = status;
-    candidate->M1 = mutableParticles->parent1(i);
-    candidate->M2 = mutableParticles->parent2(i);
-    candidate->D1 = mutableParticles->child1(i);
-    candidate->D2 = mutableParticles->child2(i);
-    pdgParticle = pdg->GetParticle(pid);
-    candidate->Charge = mutableParticles->charge(i)/3.0;
-    //candidate->Charge = pdgParticle ? Int_t(pdgParticle->Charge()/3.0) : -999;
-    candidate->Mass = mass;
-    candidate->Momentum.SetXYZM(px, py, pz, mass);
-    candidate->Position.SetXYZT(x, y, z, t);
-    allParticleOutputArray->Add(candidate);
-    if(!pdgParticle) continue;
-
-    if(status == 1)
-    {
-      stableParticleOutputArray->Add(candidate);
-    }
-    else if(pdgCode <= 5 || pdgCode == 21 || pdgCode == 15)
-    {
-      partonOutputArray->Add(candidate);
-    }
-  }
-
-  }
-
- } else {
 
 
@@ -249 +198 @@
   }
 
-
-  } // end particle type 
 
 }
@@ -352 +299 @@
 
     auto event = new proio::Event();
-
-
-   double varint_energy=0;
-   double varint_length=0;
-
-
     auto max_n_events = std::numeric_limits<uint64_t>::max();
     auto nn = inputFile->Skip(max_n_events);
@@ -379 +320 @@
         if(event == 0) continue;
 
-       // get metadata
-       if (eventCounter == 0) {
-       auto metadata = event->Metadata();
-       std::cout << "** INFO: ProIO file metadata:" << std::endl;
-       for (auto element : metadata) { 
-        string key=(string)element.first;
-        string value=(string)(*element.second);
-        std::cout << "** INFO:   " << key << " = " << value << std::endl;
-        if (key=="info:varint_energy") varint_energy=std::stod(value);
-        if (key=="info:varint_length") varint_length=std::stod(value);
-        }
-       }
-
-
         readStopWatch.Stop();
 
         procStopWatch.Start();
 
-        ConvertInput(event, varint_energy, varint_length, 
+        ConvertInput(event, 
           branchEvent, factory,
           allParticleOutputArray, stableParticleOutputArray,