Changeset b9ae4c3 in git for external/fastjet/ClusterSequence.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/ClusterSequence.cc (modified) (10 diffs)

external/fastjet/ClusterSequence.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: ClusterSequence.cc 3809 2015-02-20 13:05:13Z soyez $
+// $Id: ClusterSequence.cc 4154 2016-07-20 16:20:48Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -152 +152 @@
   // set the pointer in the wrapper to this object to NULL to say that
   // we're going out of scope
-  if (_structure_shared_ptr()){
-    ClusterSequenceStructure* csi = dynamic_cast<ClusterSequenceStructure*>(_structure_shared_ptr()); 
+  if (_structure_shared_ptr){
+    ClusterSequenceStructure* csi = dynamic_cast<ClusterSequenceStructure*>(_structure_shared_ptr.get()); 
     // normally the csi is purely internal so it really should not be
     // NULL i.e assert should be OK
@@ -724 +724 @@
   }
   
-  bool code_should_never_reach_here = false;
-  assert(code_should_never_reach_here); 
+  //bool code_should_never_reach_here = false;
+  //assert(code_should_never_reach_here);
+
+  assert(0 && "Code should never reach here");
+
   return N2MHTLazy9;
 
@@ -775 +778 @@
 
 
+ClusterSequence & ClusterSequence::operator=(const ClusterSequence & cs) {
+  // self assignment is trivial
+  if (&cs != this) {
+    _deletes_self_when_unused = false;
+    transfer_from_sequence(cs);
+  }
+  return *this;
+}
+
 //----------------------------------------------------------------------
 // transfer the sequence contained in other_seq into our own;
@@ -815 +827 @@
 
   // clean up existing structure
-  if (_structure_shared_ptr()) {
+  if (_structure_shared_ptr) {
     // If there are jets associated with an old version of the CS and
     // a new one, keeping track of when to delete the CS becomes more
@@ -823 +835 @@
     // anything that is currently associated with the cluster sequence
     // should be told that its cluster sequence no longer exists
-    ClusterSequenceStructure* csi = dynamic_cast<ClusterSequenceStructure*>(_structure_shared_ptr()); 
+    ClusterSequenceStructure* csi = dynamic_cast<ClusterSequenceStructure*>(_structure_shared_ptr.get()); 
     assert(csi != NULL);
     csi->set_associated_cs(NULL);
@@ -1455 +1467 @@
 // initialise the history in a standard way
 void ClusterSequence::_add_step_to_history (
-               const int step_number, const int parent1, 
+               //NO_LONGER_USED: const int step_number,
+               const int parent1, 
                const int parent2, const int jetp_index,
                const double dij) {
@@ -1469 +1482 @@
 
   int local_step = _history.size()-1;
-  assert(local_step == step_number);
+  //#ifndef __NO_ASSERTS__
+  //assert(local_step == step_number);
+  //#endif
 
   // sanity check: make sure the particles have not already been recombined
@@ -1669 +1684 @@
   int hist_j = _jets[jet_j].cluster_hist_index();
 
-  _add_step_to_history(newstep_k, min(hist_i, hist_j), max(hist_i,hist_j),
+  _add_step_to_history(min(hist_i, hist_j), max(hist_i,hist_j),
                        newjet_k, dij);
+
+  //  _add_step_to_history(newstep_k, min(hist_i, hist_j), max(hist_i,hist_j),
+  //                   newjet_k, dij);
+
 
 }
@@ -1680 +1699 @@
 void ClusterSequence::_do_iB_recombination_step(
                                   const int jet_i, const double diB) {
-  // get history index
-  int newstep_k = _history.size();
-
   // recombine the jet with the beam
-  _add_step_to_history(newstep_k,_jets[jet_i].cluster_hist_index(),BeamJet,
+  _add_step_to_history(_jets[jet_i].cluster_hist_index(),BeamJet,
                        Invalid, diB);
+
+  // // get history index
+  // int newstep_k = _history.size();
+  // 
+  // _add_step_to_history(newstep_k,_jets[jet_i].cluster_hist_index(),BeamJet,
+  //                   Invalid, diB);
 
 }