Changeset d4b9697 in git

Timestamp:

Dec 21, 2014, 8:43:44 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

7278220

Parents:

a5bbe8a

Message:

fix rapidity ranges for GridMedianBackgroundEstimator

Files:

• cards/delphes_card_ATLAS_PileUp.tcl (modified) (3 diffs)
• cards/delphes_card_CMS_PileUp.tcl (modified) (3 diffs)
• modules/JetPileUpSubtractor.cc (modified) (1 diff)

cards/delphes_card_ATLAS_PileUp.tcl

@@ -22 +22 @@
   EFlowMergerAllTracks
   EFlowMerger
-  
+
   NeutrinoFilter
   GenJetFinder
@@ -374 +374 @@
 
 module FastJetGridMedianEstimator Rho {
-  
+
   set InputArray Calorimeter/towers
   set RhoOutputArray rho
 
-  # etamin etamax gridsize_eta gridsize_phi 
-  
-  add GridRange 0.0 2.5 0.5 0.5
-  add GridRange 2.5 5.0 0.5 0.5
+  # add GridRange rapmin rapmax drap dphi
+  # rapmin - the minimum rapidity extent of the grid
+  # rapmax - the maximum rapidity extent of the grid
+  # drap - the grid spacing in rapidity
+  # dphi - the grid spacing in azimuth
+
+  add GridRange -5.0 -2.5 1.0 1.0
+  add GridRange -2.5 2.5 1.0 1.0
+  add GridRange 2.5 5.0 1.0 1.0
 
 }
@@ -391 +396 @@
 
 module PdgCodeFilter NeutrinoFilter {
-  
+
   set InputArray Delphes/stableParticles
   set OutputArray filteredParticles
 
   set PTMin 0.0
-  
+
   add PdgCode {12}
   add PdgCode {14}

cards/delphes_card_CMS_PileUp.tcl

@@ -22 +22 @@
   EFlowMergerAllTracks
   EFlowMerger
-  
+
   NeutrinoFilter
   GenJetFinder
@@ -386 +386 @@
 
 module FastJetGridMedianEstimator Rho {
-  
+
   set InputArray EFlowMerger/eflow
   set RhoOutputArray rho
 
-  # etamin etamax gridsize_eta gridsize_phi 
-  
-  add GridRange 0.0 2.5 1.0 1.0
+  # add GridRange rapmin rapmax drap dphi
+  # rapmin - the minimum rapidity extent of the grid
+  # rapmax - the maximum rapidity extent of the grid
+  # drap - the grid spacing in rapidity
+  # dphi - the grid spacing in azimuth
+
+  add GridRange -5.0 -2.5 1.0 1.0
+  add GridRange -2.5 2.5 1.0 1.0
   add GridRange 2.5 5.0 1.0 1.0
 
@@ -402 +407 @@
 
 module PdgCodeFilter NeutrinoFilter {
-  
+
   set InputArray Delphes/stableParticles
   set OutputArray filteredParticles
 
   set PTMin 0.0
-  
+
   add PdgCode {12}
   add PdgCode {14}

modules/JetPileUpSubtractor.cc

@@ -109 +109 @@
     momentum = candidate->Momentum;
     area = candidate->Area;
-    eta = TMath::Abs(momentum.Eta());
+    eta = momentum.Eta();
 
     // find rho