Changeset c4e18da in git

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

Files:

• cards/FCC/FCChh.tcl (modified) (2 diffs)
• examples/Validation.cpp (modified) (1 diff)
• modules/Isolation.cc (modified) (2 diffs)

cards/FCC/FCChh.tcl

@@ -277 +277 @@
 
   # set ECalResolutionFormula {resolution formula as a function of eta and energy}
-  set ResolutionFormula {                     (abs(eta) <= 4.0) * sqrt(energy^2*0.01^2 + energy*0.10^2) + \
-                            (abs(eta) > 4.0 && abs(eta) <= 6.0) * sqrt(energy^2*0.01^2  + energy*0.10^2)}
+  set ResolutionFormula {                     (abs(eta) <= 4.0) * sqrt(energy^2*0.007^2 + energy*0.10^2) + \
+                            (abs(eta) > 4.0 && abs(eta) <= 6.0) * sqrt(energy^2*0.035^2  + energy*0.30^2)}
 
 
@@ -360 +360 @@
    # set HCalResolutionFormula {resolution formula as a function of eta and energy}
   set ResolutionFormula {                     (abs(eta) <= 1.7) * sqrt(energy^2*0.03^2 + energy*0.50^2) + \
-                            (abs(eta) > 1.7 && abs(eta) <= 4.0) * sqrt(energy^2*0.05^2 + energy*0.80^2) + \
-                            (abs(eta) > 4.0 && abs(eta) <= 6.0) * sqrt(energy^2*0.05^2 + energy*1.00^2)}
+                            (abs(eta) > 1.7 && abs(eta) <= 4.0) * sqrt(energy^2*0.03^2 + energy*0.60^2) + \
+                            (abs(eta) > 4.0 && abs(eta) <= 6.0) * sqrt(energy^2*0.10^2 + energy*1.00^2)}
 }
 

examples/Validation.cpp

@@ -2642 +2642 @@
 
     mg_recbjet_lmis_pt->Draw("APE");
-    DrawAxis(mg_recbjet_lmis_pt, leg_recbjet_lmis_pt, ptMin, ptMax, 0.0, 10, "p_{T} [GeV]", "light - mistag rate (%)", true, false);
+    
+    DrawAxis(mg_recbjet_lmis_pt, leg_recbjet_lmis_pt, ptMin, ptMax, 0.0, 10.0, "p_{T} [GeV]", "light - mistag rate (%)", true, false);
+    
     leg_recbjet_lmis_pt->Draw();
     pave->Draw();

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;