Changes in / [dd514ae:6ec8d18] in git

Files:

• Makefile (modified) (1 diff)
• cards/delphes_card_FCC_basic.tcl (modified) (3 diffs)
• cards/delphes_card_LHCb.tcl (modified) (2 diffs)
• classes/DelphesClasses.cc (modified) (8 diffs)
• classes/DelphesClasses.h (modified) (7 diffs)
• display/Delphes3DGeometry.cc (modified) (5 diffs)
• display/DelphesBranchElement.cc (modified) (6 diffs)
• doc/genMakefile.tcl (modified) (1 diff)
• modules/AngularSmearing.cc (modified) (2 diffs)
• modules/BTagging.cc (modified) (3 diffs)
• modules/Efficiency.cc (modified) (2 diffs)
• modules/EnergyScale.cc (modified) (1 diff)
• modules/EnergySmearing.cc (modified) (3 diffs)
• modules/IdentificationMap.cc (modified) (3 diffs)
• modules/ImpactParameterSmearing.cc (modified) (4 diffs)
• modules/MomentumSmearing.cc (modified) (2 diffs)
• modules/SimpleCalorimeter.cc (modified) (3 diffs)
• modules/SimpleCalorimeter.h (modified) (2 diffs)
• modules/TaggingParticlesSkimmer.cc (modified) (1 diff)
• modules/TauTagging.cc (modified) (3 diffs)
• readers/DelphesCMSFWLite.cpp (modified) (8 diffs)

Makefile

@@ -29 +29 @@
 OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
 endif
-OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsCommon -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
+OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
 endif
 

cards/delphes_card_FCC_basic.tcl

@@ -226 +226 @@
   set EFlowTowerOutputArray eflowPhotons
 
-  set IsEcal true 
- 
   set EnergyMin 0.5
   set EnergySignificanceMin 1.0
@@ -292 +290 @@
   set EFlowTowerOutputArray eflowNeutralHadrons
 
-  set IsEcal false 
- 
   set EnergyMin 1.0
   set EnergySignificanceMin 1.0
@@ -435 +431 @@
 
 module FastJetFinder FastJetFinder {
-#  set InputArray TowerMerger/towers
+#  set InputArray Calorimeter/towers
   set InputArray EFlowMerger/eflow
 

cards/delphes_card_LHCb.tcl

@@ -223 +223 @@
   set TowerOutputArray ecalTowers
   set EFlowTowerOutputArray eflowPhotons
-
-  set IsEcal true
 
   set EnergyMin 0.0
@@ -305 +303 @@
   set TowerOutputArray hcalTowers
   set EFlowTowerOutputArray eflowNeutralHadrons
-
-  set IsEcal false 
 
   set EnergyMin 0.0

classes/DelphesClasses.cc

@@ -45 +45 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector GenParticle::P4() const
+TLorentzVector GenParticle::P4()
 {
   TLorentzVector vec;
@@ -54 +54 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector MissingET::P4() const
+TLorentzVector MissingET::P4()
 {
   TLorentzVector vec;
@@ -63 +63 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Photon::P4() const
+TLorentzVector Photon::P4()
 {
   TLorentzVector vec;
@@ -72 +72 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Electron::P4() const
+TLorentzVector Electron::P4()
 {
   TLorentzVector vec;
@@ -81 +81 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Muon::P4() const
+TLorentzVector Muon::P4()
 {
   TLorentzVector vec;
@@ -90 +90 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Jet::P4() const
+TLorentzVector Jet::P4()
 {
   TLorentzVector vec;
@@ -99 +99 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Track::P4() const
+TLorentzVector Track::P4()
 {
   TLorentzVector vec;
@@ -108 +108 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Tower::P4() const
+TLorentzVector Tower::P4()
 {
   TLorentzVector vec;

classes/DelphesClasses.h

@@ -161 +161 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4() const;
+  TLorentzVector P4();
 
   ClassDef(GenParticle, 1)
@@ -188 +188 @@
   Float_t Phi; // mising energy azimuthal angle
 
-  TLorentzVector P4() const;
+  TLorentzVector P4();
 
   ClassDef(MissingET, 1)
@@ -254 +254 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4() const;
+  TLorentzVector P4();
 
   ClassDef(Photon, 2)
@@ -289 +289 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4() const;
+  TLorentzVector P4();
 
   ClassDef(Electron, 2)
@@ -322 +322 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4() const;
+  TLorentzVector P4();
 
   ClassDef(Muon, 2)
@@ -419 +419 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4() const;
+  TLorentzVector P4();
 
   ClassDef(Track, 2)
@@ -448 +448 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4() const;
+  TLorentzVector P4();
 
   ClassDef(Tower, 1)

display/Delphes3DGeometry.cc

@@ -20 +20 @@
 #include <set>
 #include <map>
-#include <string>
 #include <utility>
 #include <vector>
@@ -38 +37 @@
 #include "classes/DelphesClasses.h"
 #include "TF2.h"
-#include "TFormula.h"
 #include "TH1F.h"
 #include "TMath.h"
@@ -92 +90 @@
    tk_length_ = confReader->GetDouble(Form("%s::HalfLength",ParticlePropagator), 3.0)*100.;     // tk_length
    tk_Bz_     = confReader->GetDouble("ParticlePropagator::Bz", 0.0);                           // tk_Bz
-   
-   string buffer;
-   const char *it;
- 
-   
+
    {
    TString tkEffFormula = confReader->GetString(Form("%s::EfficiencyFormula",TrackingEfficiency),"abs(eta)<3.0");
@@ -102 +96 @@
    tkEffFormula.ReplaceAll("eta","y");
    tkEffFormula.ReplaceAll("phi","0.");
- 
-   for(it = tkEffFormula.Data(); *it; ++it)
-   {
-     if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
-     buffer.push_back(*it);
-   }
-
-   TF2* tkEffFunction = new TF2("tkEff",buffer.c_str(),0,1000,-10,10);
+   TF2* tkEffFunction = new TF2("tkEff",tkEffFormula,0,1000,-10,10);
    TH1F etaHisto("eta","eta",100,5.,-5.);
    Double_t pt,eta;
@@ -131 +118 @@
    muonEffFormula.ReplaceAll("eta","y");
    muonEffFormula.ReplaceAll("phi","0.");
-   
-   buffer.clear();
-   for(it = muonEffFormula.Data(); *it; ++it)
-   {
-     if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
-     buffer.push_back(*it);
-   }
-
-   TF2* muEffFunction = new TF2("muEff",buffer.c_str(),0,1000,-10,10);
+   TF2* muEffFunction = new TF2("muEff",muonEffFormula,0,1000,-10,10);
    TH1F etaHisto("eta2","eta2",100,5.,-5.);
    Double_t pt,eta;

display/DelphesBranchElement.cc

@@ -155 +155 @@
   trkProp->SetMaxR(tkRadius_);
   trkProp->SetMaxZ(tkHalfLength_);
-  GenParticle *particle;
   if(type=="Track") { // CASE 1: TRACKS
     Track *track;
@@ -162 +161 @@
                    track->P4().Px(), track->P4().Py(),
                    track->P4().Pz(), track->P4().E(),
-                   track->X/10.0, track->Y/10.0, track->Z/10.0, track->T/10.0);
+                   track->X, track->Y, track->Z, 0.0);
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
@@ -174 +173 @@
     Electron *electron;
     while((electron = (Electron *) itTrack.Next())) {
-      particle = (GenParticle*) electron->Particle.GetObject();
       TParticle pb(electron->Charge<0?11:-11, 1, 0, 0, 0, 0,
                    electron->P4().Px(), electron->P4().Py(),
                    electron->P4().Pz(), electron->P4().E(),
-                   particle->X/10.0, particle->Y/10.0, particle->Z/10.0, particle->T/10.0);
+                   0., 0., 0., 0.);
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
@@ -190 +188 @@
     Muon *muon;
     while((muon = (Muon *) itTrack.Next())) {
-      particle = (GenParticle*) muon->Particle.GetObject();
       TParticle pb(muon->Charge<0?13:-13, 1, 0, 0, 0, 0,
                    muon->P4().Px(), muon->P4().Py(),
                    muon->P4().Pz(), muon->P4().E(),
-                   particle->X/10.0, particle->Y/10.0, particle->Z/10.0, particle->T/10.0);
+                   0., 0., 0., 0.);
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
@@ -209 +206 @@
                    photon->P4().Px(), photon->P4().Py(),
                    photon->P4().Pz(), photon->P4().E(),
-                   0.0, 0.0, 0.0, 0.0);
+                   0., 0., 0., 0.);
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
@@ -226 +223 @@
                    particle->P4().Px(), particle->P4().Py(),
                    particle->P4().Pz(), particle->P4().E(),
-                   particle->X/10.0, particle->Y/10.0, particle->Z/10.0, particle->T/10.0);
+                   particle->X, particle->Y, particle->Z, particle->T);
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));

doc/genMakefile.tcl

@@ -219 +219 @@
 OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
 endif
-OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsCommon -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
+OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
 endif
 

modules/AngularSmearing.cc

@@ -100 +100 @@
 {
   Candidate *candidate, *mother;
-  Double_t pt, eta, phi, e;
+  Double_t pt, eta, phi;
 
   fItInputArray->Reset();
@@ -110 +110 @@
     phi = candidatePosition.Phi();
     pt = candidateMomentum.Pt();
-    e = candidateMomentum.E();
 
     // apply smearing formula for eta,phi
 
-    eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e));
-    phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e));
+    eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta));
+    phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta));
     
     if(pt <= 0.0) continue;

modules/BTagging.cc

@@ -171 +171 @@
 {
   Candidate *jet, *parton;
-  Double_t pt, eta, phi, e;
+  Double_t pt, eta, phi;
   TObjArray *partonArray;
   map< Int_t, DelphesFormula * >::iterator itEfficiencyMap;
@@ -194 +194 @@
     phi = jetMomentum.Phi();
     pt = jetMomentum.Pt();
-    e = jetMomentum.E();
-    
+
     // loop over all input partons
     itPartonArray.Reset();
@@ -219 +218 @@
 
     // apply an efficency formula
-    jet->BTag |= (gRandom->Uniform() <= formula->Eval(pt, eta, phi, e)) << fBitNumber;
-  }
-}
-
-//------------------------------------------------------------------------------
+    jet->BTag |= (gRandom->Uniform() <= formula->Eval(pt, eta)) << fBitNumber;
+  }
+}
+
+//------------------------------------------------------------------------------

modules/Efficiency.cc

@@ -96 +96 @@
 { 
   Candidate *candidate;
-  Double_t pt, eta, phi, e;
+  Double_t pt, eta, phi;
 
   fItInputArray->Reset();
@@ -106 +106 @@
     phi = candidatePosition.Phi();
     pt = candidateMomentum.Pt();
-    e = candidateMomentum.E();
 
     // apply an efficency formula
-    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e)) continue;
+    if(gRandom->Uniform() > fFormula->Eval(pt, eta)) continue;
     
     fOutputArray->Add(candidate);

modules/EnergyScale.cc

@@ -104 +104 @@
     momentum = candidate->Momentum;
 
-    scale = fFormula->Eval(momentum.Pt(), momentum.Eta(), momentum.Phi(), momentum.E());
+    scale = fFormula->Eval(momentum.Pt(), momentum.Eta());
 
     if(scale > 0.0) momentum *= scale;

modules/EnergySmearing.cc

@@ -96 +96 @@
 {
   Candidate *candidate, *mother;
-  Double_t pt, energy, eta, phi;
+  Double_t energy, eta, phi;
 
   fItInputArray->Reset();
@@ -103 +103 @@
     const TLorentzVector &candidatePosition = candidate->Position;
     const TLorentzVector &candidateMomentum = candidate->Momentum;
-    
-    pt = candidatePosition.Pt();
     eta = candidatePosition.Eta();
     phi = candidatePosition.Phi();
@@ -110 +108 @@
  
     // apply smearing formula
-    energy = gRandom->Gaus(energy, fFormula->Eval(pt, eta, phi, energy));
+    energy = gRandom->Gaus(energy, fFormula->Eval(0.0, eta, 0.0, energy));
      
     if(energy <= 0.0) continue;

modules/IdentificationMap.cc

@@ -127 +127 @@
 {
   Candidate *candidate;
-  Double_t pt, eta, phi, e;
+  Double_t pt, eta, phi;
   TMisIDMap::iterator itEfficiencyMap;
   pair <TMisIDMap::iterator, TMisIDMap::iterator> range;
@@ -143 +143 @@
     phi = candidatePosition.Phi();
     pt = candidateMomentum.Pt();
-    e = candidateMomentum.E();
-   
     pdgCodeIn = candidate->PID;
     charge = candidate->Charge;
@@ -166 +164 @@
       pdgCodeOut = (it->second).first;
 
-      p = formula->Eval(pt, eta, phi, e);
+      p = formula->Eval(pt, eta);
 
       if(total <= r && r < total + p)

modules/ImpactParameterSmearing.cc

@@ -97 +97 @@
   Candidate *candidate, *particle, *mother;
   Double_t xd, yd, zd, dxy, sx, sy, sz, ddxy;
-  Double_t pt, eta, px, py, phi, e;
+  Double_t pt, eta, px, py;
 
   fItInputArray->Reset();
@@ -110 +110 @@
     eta = candidateMomentum.Eta();
     pt = candidateMomentum.Pt();
-    phi = candidateMomentum.Phi();
-    e = candidateMomentum.E();
-    
     px = candidateMomentum.Px();
     py = candidateMomentum.Py();
@@ -122 +119 @@
 
     // calculate smeared values
-    sx = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
-    sy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
-    sz = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
+    sx = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
+    sy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
+    sz = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
 
     xd += sx;
@@ -133 +130 @@
     dxy = (xd*py - yd*px)/pt;
 
-    ddxy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
+    ddxy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
 
     // fill smeared values in candidate

modules/MomentumSmearing.cc

@@ -96 +96 @@
 {
   Candidate *candidate, *mother;
-  Double_t pt, eta, phi, e;
+  Double_t pt, eta, phi;
 
   fItInputArray->Reset();
@@ -106 +106 @@
     phi = candidatePosition.Phi();
     pt = candidateMomentum.Pt();
-    e = candidateMomentum.E();
 
     // apply smearing formula
-    pt = gRandom->Gaus(pt, fFormula->Eval(pt, eta, phi, e) * pt);
+    pt = gRandom->Gaus(pt, fFormula->Eval(pt, eta) * pt);
     
     if(pt <= 0.0) continue;

modules/SimpleCalorimeter.cc

@@ -149 +149 @@
 
   fEnergySignificanceMin = GetDouble("EnergySignificanceMin", 0.0);
-
-  // flag that says if current calo is Ecal of Hcal (will then fill correct values of Eem and Ehad)
-  fIsEcal = GetBool("IsEcal", false);
 
   // switch on or off the dithering of the center of calorimeter towers
@@ -428 +425 @@
   fTower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
 
-  fTower->Eem = (!fIsEcal) ? 0 : energy;
-  fTower->Ehad = (fIsEcal) ? 0 : energy; 
-
   fTower->Edges[0] = fTowerEdges[0];
   fTower->Edges[1] = fTowerEdges[1];
@@ -453 +447 @@
     pt = energy / TMath::CosH(eta);
 
-    tower->Eem = (!fIsEcal) ? 0 : energy;
-    tower->Ehad = (fIsEcal) ? 0 : energy; 
-
     tower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
     fEFlowTowerOutputArray->Add(tower);

modules/SimpleCalorimeter.h

@@ -1 @@
-
 /*
  *  Delphes: a framework for fast simulation of a generic collider experiment
@@ -75 +74 @@
   Bool_t fSmearTowerCenter;
 
-  Bool_t fIsEcal; //! 
-
   TFractionMap fFractionMap; //!
   TBinMap fBinMap; //!

modules/TaggingParticlesSkimmer.cc

@@ -162 +162 @@
    
     eta = TMath::Abs(candidate->Momentum.Eta());
-    if(eta > fEtaMax) continue;
+    if(eta < fEtaMax) continue;
         
     fOutputArray->Add(candidate);

modules/TauTagging.cc

@@ -73 +73 @@
 
   if(tau->D1 < 0) return -1;
-
-  if(tau->D2 < tau->D1) return -1;
 
   if(tau->D1 >= fParticleInputArray->GetEntriesFast() ||
@@ -203 +201 @@
   tauArray = fFilter->GetSubArray(fClassifier, 0);
 
+  if(tauArray == 0) return;
+
+  TIter itTauArray(tauArray);
+
   // loop over all input jets
   fItJetInputArray->Reset();
@@ -215 +217 @@
 
     // loop over all input taus
-    if(tauArray){
-      TIter itTauArray(tauArray);
-      while((tau = static_cast<Candidate *>(itTauArray.Next())))
+    itTauArray.Reset();
+    while((tau = static_cast<Candidate *>(itTauArray.Next())))
+    {
+      if(tau->D1 < 0) continue;
+
+      if(tau->D1 >= fParticleInputArray->GetEntriesFast() ||
+         tau->D2 >= fParticleInputArray->GetEntriesFast())
       {
-        if(tau->D1 < 0) continue;
-
-        if(tau->D1 >= fParticleInputArray->GetEntriesFast() ||
-           tau->D2 >= fParticleInputArray->GetEntriesFast())
-        {
-          throw runtime_error("tau's daughter index is greater than the ParticleInputArray size");
-        }
-
-        tauMomentum.SetPxPyPzE(0.0, 0.0, 0.0, 0.0);
-
-        for(i = tau->D1; i <= tau->D2; ++i)
-        {
-          daughter = static_cast<Candidate *>(fParticleInputArray->At(i));
-          if(TMath::Abs(daughter->PID) == 16) continue;
-          tauMomentum += daughter->Momentum;
-        }
-
-        if(jetMomentum.DeltaR(tauMomentum) <= fDeltaR)
-        {
-          pdgCode = 15;
-          charge = tau->Charge;
-        }
+        throw runtime_error("tau's daughter index is greater than the ParticleInputArray size");
+      }
+
+      tauMomentum.SetPxPyPzE(0.0, 0.0, 0.0, 0.0);
+
+      for(i = tau->D1; i <= tau->D2; ++i)
+      {
+        daughter = static_cast<Candidate *>(fParticleInputArray->At(i));
+        if(TMath::Abs(daughter->PID) == 16) continue;
+        tauMomentum += daughter->Momentum;
+      }
+
+      if(jetMomentum.DeltaR(tauMomentum) <= fDeltaR)
+      {
+        pdgCode = 15;
+        charge = tau->Charge;
       }
     }

readers/DelphesCMSFWLite.cpp

@@ -56 +56 @@
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
-#include "SimDataFormats/GeneratorProducts/interface/LHEEventProduct.h"
-#include "SimDataFormats/GeneratorProducts/interface/WeightsInfo.h"
 
 using namespace std;
@@ -64 +62 @@
 
 void ConvertInput(fwlite::Event &event, Long64_t eventCounter,
-  ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchRwgt,
-  DelphesFactory *factory, TObjArray *allParticleOutputArray,
-  TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray)
+  ExRootTreeBranch *branchEvent, DelphesFactory *factory,
+  TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray,
+  TObjArray *partonOutputArray)
 {
   fwlite::Handle< GenEventInfoProduct > handleGenEventInfo;
 
-  fwlite::Handle< LHEEventProduct > handleLHEEvent;
-
   fwlite::Handle< vector< reco::GenParticle > > handleParticle;
   vector< reco::GenParticle >::const_iterator itParticle;
@@ -79 +75 @@
 
   handleGenEventInfo.getByLabel(event, "generator");
-  handleLHEEvent.getByLabel(event, "source");
   handleParticle.getByLabel(event, "genParticles");
 
   HepMCEvent *element;
-  Weight *weight;
   Candidate *candidate;
   TDatabasePDG *pdg;
@@ -92 +86 @@
   Double_t px, py, pz, e, mass;
   Double_t x, y, z;
-
-  const vector< gen::WeightsInfo > &vectorWeightsInfo = handleLHEEvent->weights();
-  vector< gen::WeightsInfo >::const_iterator itWeightsInfo;
 
   element = static_cast<HepMCEvent *>(branchEvent->NewEntry());
@@ -117 +108 @@
   element->ReadTime = 0.0;
   element->ProcTime = 0.0;
-
-  for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
-  {
-    weight = static_cast<Weight *>(branchRwgt->NewEntry());
-    weight->Weight = itWeightsInfo->wgt;
-  }
 
   pdg = TDatabasePDG::Instance();
@@ -201 +186 @@
   TStopwatch eventStopWatch;
   ExRootTreeWriter *treeWriter = 0;
-  ExRootTreeBranch *branchEvent = 0, *branchRwgt = 0;
+  ExRootTreeBranch *branchEvent = 0;
   ExRootConfReader *confReader = 0;
   Delphes *modularDelphes = 0;
@@ -241 +226 @@
 
     branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class());
-    branchRwgt = treeWriter->NewBranch("Rwgt", Weight::Class());
 
     confReader = new ExRootConfReader;
@@ -284 +268 @@
       for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
       {
-        ConvertInput(event, eventCounter, branchEvent, branchRwgt, factory,
+        ConvertInput(event, eventCounter, branchEvent, factory,
           allParticleOutputArray, stableParticleOutputArray, partonOutputArray);
         modularDelphes->ProcessTask();