Changeset b9ae4c3 in git for external/fastjet/tools/JetMedianBackgroundEstimator.cc

Timestamp:

Sep 2, 2016, 3:46:14 PM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fa068d3

Parents:

ec5e04b (diff), 23389ff (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.

git-author:

Pavel Demin <pavel-demin@…> (09/02/16 15:46:14)

git-committer:

GitHub <noreply@…> (09/02/16 15:46:14)

Message:

Merge pull request #32 from delphes/dev_01

Dev 01

File:

• external/fastjet/tools/JetMedianBackgroundEstimator.cc (modified) (5 diffs)

external/fastjet/tools/JetMedianBackgroundEstimator.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: JetMedianBackgroundEstimator.cc 3517 2014-08-01 14:23:13Z soyez $
+// $Id: JetMedianBackgroundEstimator.cc 4047 2016-03-03 13:21:49Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -194 +194 @@
 
   _csi = jets[0].structure_shared_ptr();
-  ClusterSequenceStructure * csi = dynamic_cast<ClusterSequenceStructure*>(_csi());
+  ClusterSequenceStructure * csi = dynamic_cast<ClusterSequenceStructure*>(_csi.get());
   const ClusterSequenceAreaBase * csab = csi->validated_csab();
 
@@ -467 +467 @@
 
   // determine the number of empty jets
-  const ClusterSequenceAreaBase * csab = (dynamic_cast<ClusterSequenceStructure*>(_csi()))->validated_csab();
+  const ClusterSequenceAreaBase * csab = (dynamic_cast<ClusterSequenceStructure*>(_csi.get()))->validated_csab();
   if (csab->has_explicit_ghosts()) {
     _empty_area = 0.0;
@@ -503 +503 @@
 // throw an error otherwise
 void JetMedianBackgroundEstimator::_check_csa_alive() const{
-  ClusterSequenceStructure* csa = dynamic_cast<ClusterSequenceStructure*>(_csi());
+  ClusterSequenceStructure* csa = dynamic_cast<ClusterSequenceStructure*>(_csi.get());
   if (csa == 0) {
     throw Error("JetMedianBackgroundEstimator: there is no cluster sequence associated with the JetMedianBackgroundEstimator");
   }
-  if (! dynamic_cast<ClusterSequenceStructure*>(_csi())->has_associated_cluster_sequence())
+  if (! dynamic_cast<ClusterSequenceStructure*>(_csi.get())->has_associated_cluster_sequence())
     throw Error("JetMedianBackgroundEstimator: modifications are no longer possible as the underlying ClusterSequence has gone out of scope");
 }
@@ -521 +521 @@
   // cluster sequence
   if (_jet_def.jet_algorithm() == undefined_jet_algorithm){
-    const ClusterSequence * cs = dynamic_cast<ClusterSequenceStructure*>(_csi())->validated_cs();
+    const ClusterSequence * cs = dynamic_cast<ClusterSequenceStructure*>(_csi.get())->validated_cs();
     jet_def = &(cs->jet_def());
   }