Changeset dd514ae in git for modules/TaggingParticlesSkimmer.cc

Timestamp:

Jun 10, 2015, 4:04:47 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8707eeb

Parents:

6ec8d18 (diff), 9c491e1 (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:

resolve conflict in DelphesClasses.h

File:

• modules/TaggingParticlesSkimmer.cc (modified) (1 diff)

modules/TaggingParticlesSkimmer.cc

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