Merge pull request #22305 from rappoccio/fj330_warnings

Fixing compiler warnings after updating to fastjet 3.3.0.

RecoJets/JetProducers/interface/PileUpSubtractor.h

@@ -76,8 +76,6 @@ class PileUpSubtractor{
   double                nSigmaPU_;                  // number of sigma for pileup
   double                radiusPU_;                  // pileup radius
   ActiveAreaSpecPtr               fjActiveArea_;    // fastjet active area definition
-  RangeDefPtr                     fjRangeDef_;      // range definition
-
   CaloGeometry const *  geo_;                       // geometry
   int                   ietamax_;                   // maximum eta in geometry
   int                   ietamin_;                   // minimum eta in geometry

RecoJets/JetProducers/plugins/VirtualJetProducer.cc

@@ -229,15 +229,15 @@ VirtualJetProducer::VirtualJetProducer(const edm::ParameterSet& iConfig) {
 
 		if (voronoiRfact_ <= 0) {
 			fjActiveArea_     = ActiveAreaSpecPtr(new fastjet::GhostedAreaSpec(ghostEtaMax_,activeAreaRepeats_,ghostArea_));
-			fjActiveArea_->set_fj2_placement(true);
+
 
 			if ( !useExplicitGhosts_ ) {
 				fjAreaDefinition_ = AreaDefinitionPtr( new fastjet::AreaDefinition(fastjet::active_area, *fjActiveArea_ ) );
 			} else {
 				fjAreaDefinition_ = AreaDefinitionPtr( new fastjet::AreaDefinition(fastjet::active_area_explicit_ghosts, *fjActiveArea_ ) );
 			}
 		}
-		fjRangeDef_ = RangeDefPtr( new fastjet::RangeDefinition(rhoEtaMax_) );
+		fjSelector_ =  SelectorPtr( new fastjet::Selector( fastjet::SelectorAbsRapMax(rhoEtaMax_) ) );
 	} 
 
 	if( ( doFastJetNonUniform_ ) && ( puCenters_.empty() ) ) 
@@ -647,20 +647,14 @@ void VirtualJetProducer::writeJets( edm::Event & iEvent, edm::EventSetup const&
 
       fastjet::ClusterSequenceAreaBase const* clusterSequenceWithArea =
         dynamic_cast<fastjet::ClusterSequenceAreaBase const *> ( &*fjClusterSeq_ );
-      /*
-	const double nemptyjets = clusterSequenceWithArea->n_empty_jets(*fjRangeDef_);
-	if(( nemptyjets  < -15 ) || ( nemptyjets > fjRangeDef_->area()+ 15)) {
-	edm::LogWarning("StrangeNEmtpyJets") << "n_empty_jets is : " << clusterSequenceWithArea->n_empty_jets(*fjRangeDef_) << " with range " << fjRangeDef_->description() << ".";
-	}
-      */
       if (clusterSequenceWithArea ==nullptr ){
 	if (!fjJets_.empty()) {
 	  throw cms::Exception("LogicError")<<"fjClusterSeq is not initialized while inputs are present\n ";
 	}
       } else {
-	clusterSequenceWithArea->get_median_rho_and_sigma(*fjRangeDef_,false,*rho,*sigma,mean_area);
+	clusterSequenceWithArea->get_median_rho_and_sigma(*fjSelector_,false,*rho,*sigma,mean_area);
 	if((*rho < 0)|| (edm::isNotFinite(*rho))) {
-	  edm::LogError("BadRho") << "rho value is " << *rho << " area:" << mean_area << " and n_empty_jets: " << clusterSequenceWithArea->n_empty_jets(*fjRangeDef_) << " with range " << fjRangeDef_->description()
+	  edm::LogError("BadRho") << "rho value is " << *rho << " area:" << mean_area << " and n_empty_jets: " << clusterSequenceWithArea->n_empty_jets(*fjSelector_) << " with range " << fjSelector_->description()
 				  <<". Setting rho to rezo.";
 	  *rho = 0;
 	}

RecoJets/JetProducers/plugins/VirtualJetProducer.h

@@ -27,6 +27,7 @@
 #include "fastjet/ClusterSequenceArea.hh"
 #include "fastjet/PseudoJet.hh"
 #include "fastjet/GhostedAreaSpec.hh"
+#include "fastjet/Selector.hh"
 
 #include <memory>
 #include <vector>
@@ -90,7 +91,7 @@ class dso_hidden VirtualJetProducer : public edm::stream::EDProducer<>
   typedef boost::shared_ptr<fastjet::JetDefinition>          JetDefPtr;
   typedef boost::shared_ptr<fastjet::GhostedAreaSpec>        ActiveAreaSpecPtr;
   typedef boost::shared_ptr<fastjet::AreaDefinition>         AreaDefinitionPtr;
-  typedef boost::shared_ptr<fastjet::RangeDefinition>        RangeDefPtr;
+  typedef boost::shared_ptr<fastjet::Selector>               SelectorPtr;
 
   //
   // member functions
@@ -202,7 +203,7 @@ class dso_hidden VirtualJetProducer : public edm::stream::EDProducer<>
   PluginPtr                       fjPlugin_;        // fastjet plugin
   ActiveAreaSpecPtr               fjActiveArea_;    // fastjet active area definition
   AreaDefinitionPtr               fjAreaDefinition_;// fastjet area definition
-  RangeDefPtr                     fjRangeDef_;      // range definition
+  SelectorPtr                     fjSelector_;      // selector for range definition
   std::vector<fastjet::PseudoJet> fjInputs_;        // fastjet inputs
   std::vector<fastjet::PseudoJet> fjJets_;          // fastjet jets
 

RecoJets/JetProducers/src/PileUpSubtractor.cc

@@ -32,7 +32,6 @@ PileUpSubtractor::PileUpSubtractor(const edm::ParameterSet& iConfig, edm::Consum
 		fjActiveArea_ =  ActiveAreaSpecPtr(new fastjet::ActiveAreaSpec(ghostEtaMax,
 									     activeAreaRepeats,
 									     ghostArea));
-		fjRangeDef_ = RangeDefPtr( new fastjet::RangeDefinition(ghostEtaMax) );
 		if ( ( ghostEtaMax < 0 ) || ( activeAreaRepeats < 0 ) || ( ghostArea < 0 ) )  
 			throw cms::Exception("doAreaFastjet or doRhoFastjet") << "Parameters ghostEtaMax, activeAreaRepeats or ghostArea for doAreaFastjet/doRhoFastjet are not defined." << std::endl;
 	}