Changeset c4e18da in git for modules

Timestamp:

Apr 12, 2017, 5:23:21 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

3718b36

Parents:

eb3be06 (diff), eb332c8 (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:

Merge branch 'master' of github.com:delphes/delphes

Conflicts:

examples/Validation.cpp

File:

• modules/Isolation.cc (modified) (2 diffs)

modules/Isolation.cc

@@ -167 +167 @@
   fFilter->Reset();
   isolationArray = fFilter->GetSubArray(fClassifier, 0);
+  cout<<"------------------------------------"<<endl;
 
   if(isolationArray == 0) return;
 
   TIter itIsolationArray(isolationArray);
+
 
   // loop over all input jets
@@ -261 +263 @@
     ratioRhoCorr = sumRhoCorr/candidateMomentum.Pt();
 
+    cout<<"------------------------------------"<<endl;
+    cout<<sumDBeta<<endl;
+
     candidate->IsolationVar = ratioDBeta;
     candidate->IsolationVarRhoCorr = ratioRhoCorr;