Changeset 406b698 in git

Timestamp:

Dec 21, 2014, 11:04:36 AM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

1d1f6a4

Parents:

a740c66

Message:

replace map with vector< GridMedianBackgroundEstimator * >

Files:

• external/fastjet/RectangularGrid.hh (modified) (1 diff)
• external/fastjet/tools/GridMedianBackgroundEstimator.hh (modified) (2 diffs)
• modules/FastJetGridMedianEstimator.cc (modified) (5 diffs)
• modules/FastJetGridMedianEstimator.h (modified) (3 diffs)

external/fastjet/RectangularGrid.hh

@@ -42 +42 @@
 class TilingBase {
 public:
+  virtual ~TilingBase() {}
+
   /// returns the index of the tile in which p is located, or -1 if p
   /// is outside the tiling region

external/fastjet/tools/GridMedianBackgroundEstimator.hh

@@ -77 +77 @@
 class GridMedianBackgroundEstimator : public BackgroundEstimatorBase
 #ifdef FASTJET_GMBGE_USEFJGRID
-                                                                    , RectangularGrid
+                                                                    , public RectangularGrid
 #endif 
 {
@@ -93 +93 @@
     RectangularGrid(ymax, requested_grid_spacing),
     _has_particles(false), _enable_rho_m(true) {} 
+
+  /// ctor with more control over initialisation
+  ///  \param rapmin         the minimum rapidity extent of the grid
+  ///  \param rapmax         the maximum rapidity extent of the grid
+  ///  \param drap           the grid spacing in rapidity
+  ///  \param dphi           the grid spacing in azimuth
+  ///  \param tile_selector  optional (geometric) selector to specify
+  ///                        which tiles are good; a tile is good if
+  ///                        a massless 4-vector at the center of the tile passes
+  ///                        the selection
+  GridMedianBackgroundEstimator(double rapmin_in, double rapmax_in, double drap_in, double dphi_in,
+                                Selector tile_selector = Selector()) :
+    RectangularGrid(rapmin_in, rapmax_in, drap_in, dphi_in, tile_selector),
+    _has_particles(false), _enable_rho_m(true) {}
 
   //----------------------------------------------------------------

modules/FastJetGridMedianEstimator.cc

@@ -94 +94 @@
 void FastJetGridMedianEstimator::Init()
 {
-  // read eta ranges
+  ExRootConfParam param;
+  Long_t i, size;
+  Double_t drap, dphi, rapMin, rapMax;
 
-  ExRootConfParam param = GetParam("GridRange");
-  Long_t i, size;
-  
-  fGrid.clear();
+  // read rapidity ranges
+
+  param = GetParam("GridRange");
   size = param.GetSize();
+
+  fEstimators.clear();
   for(i = 0; i < size/4; ++i)
   {
-    fGrid[make_pair(param[i*4].GetDouble(), param[i*4 + 1].GetDouble())] = make_pair(param[i*4 + 2].GetDouble(), param[i*4 + 3].GetDouble());
-    //cout<<param[i*4].GetDouble()<<","<<  param[i*4 + 1].GetDouble()<<","<< param[i*4 + 2].GetDouble()<<","<< param[i*4 + 3].GetDouble()<<endl;
+    rapMin = param[i*4].GetDouble();
+    rapMax = param[i*4 + 1].GetDouble();
+    drap = param[i*4 + 2].GetDouble();
+    dphi = param[i*4 + 3].GetDouble();
+    fEstimators.push_back(new GridMedianBackgroundEstimator(rapMin, rapMax, drap, dphi));
+  }
 
-  }
- 
-  
-  //cout<<fGrid[make_pair(0.0,2.5)].first<<","<<fGrid[make_pair(0.0,2.5)].second<<endl;
- 
- // import input array
+  // import input array
 
   fInputArray = ImportArray(GetString("InputArray", "Calorimeter/towers"));
@@ -117 +119 @@
 
   fRhoOutputArray = ExportArray(GetString("RhoOutputArray", "rho"));
-  
 }
 
@@ -124 +125 @@
 void FastJetGridMedianEstimator::Finish()
 {
+  vector< GridMedianBackgroundEstimator * >::iterator itEstimators;
+
+  for(itEstimators = fEstimators.begin(); itEstimators != fEstimators.end(); ++itEstimators)
+  {
+    if(*itEstimators) delete *itEstimators;
+  }
+
   if(fItInputArray) delete fItInputArray;
 }
@@ -133 +141 @@
   Candidate *candidate;
   TLorentzVector momentum;
-  Double_t deta, dphi, detaMin, detaMax;
   Int_t number;
   Double_t rho = 0;
   PseudoJet jet;
-  vector<PseudoJet> inputList, outputList;
-  
-  std::map< std::pair< Double_t , Double_t > , std::pair< Double_t , Double_t > >::iterator itGrid;
-  
+  vector< PseudoJet > inputList, outputList;
+
+  vector< GridMedianBackgroundEstimator * >::iterator itEstimators;;
+
   DelphesFactory *factory = GetFactory();
- 
+
   inputList.clear();
- 
+
   // loop over input objects
   fItInputArray->Reset();
@@ -157 +164 @@
   }
 
- 
   // compute rho and store it
-  
-  // cout<<"caio"<<endl;
-  for(itGrid = fGrid.begin(); itGrid != fGrid.end(); ++itGrid)
+
+  for(itEstimators = fEstimators.begin(); itEstimators != fEstimators.end(); ++itEstimators)
   {
-   //Selector select_rapidity = SelectorAbsRapRange(itEtaRangeMap->first, itEtaRangeMap->second);
-   // JetMedianBackgroundEstimator estimator(select_rapidity, *fDefinition, *fAreaDefinition);
-      
-    //cout<<itGrid->first.first<<endl;
-   
-    detaMin = (itGrid->first).first;
-    detaMax = (itGrid->first).second;
-    deta    = (itGrid->second).first;
-    dphi    = (itGrid->second).second;
-    
-    //cout<<detaMin<<","<<detaMax<<","<<deta<<","<<dphi<<endl;
-    
-    
-    RectangularGrid grid(detaMin, detaMax, deta, dphi);
-    //cout<<grid.is_initialised()<<endl;
-    //cout<<grid.rapmin()<<","<<grid.rapmax()<<","<<grid.drap()<<","<<grid.dphi()<<endl;
-      
-    GridMedianBackgroundEstimator estimator(grid);
-      
-    estimator.set_particles(inputList);
-      
-    //cout<<estimator.description()<<endl;
-      
-    rho = estimator.rho();
-    //cout<<rho<<endl;      
+    (*itEstimators)->set_particles(inputList);
 
+    rho = (*itEstimators)->rho();
 
     candidate = factory->NewCandidate();
     candidate->Momentum.SetPtEtaPhiE(rho, 0.0, 0.0, rho);
-    candidate->Edges[0] = detaMin;
-    candidate->Edges[1] = detaMax;
+    candidate->Edges[0] = (*itEstimators)->rapmin();
+    candidate->Edges[1] = (*itEstimators)->rapmax();
     fRhoOutputArray->Add(candidate);
   }
- 
 }

modules/FastJetGridMedianEstimator.h

@@ -30 +30 @@
 
 #include "classes/DelphesModule.h"
-#include <map>
-#include <utility>
-
+#include <vector>
 
 class TObjArray;
@@ -38 +36 @@
 
 namespace fastjet {
-  class JetDefinition;
-  class AreaDefinition;
-  class Selector;
-  namespace contrib {
-    class NjettinessPlugin;
-  }
+  class GridMedianBackgroundEstimator;
 }
 
@@ -58 +51 @@
 
 private:
-  
-  typedef std::map< std::pair< Double_t , Double_t > , std::pair< Double_t , Double_t > > TGrid; //!
-    
-  TGrid fGrid; //!
- 
+
+  std::vector< fastjet::GridMedianBackgroundEstimator * > fEstimators; //!
+
   TIterator *fItInputArray; //!