Changeset 8c3ac78 in git for modules/FastJetFinder.cc

Timestamp:

Apr 11, 2018, 6:26:41 PM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

58cfe91, 900ad95

Parents:

a670493 (diff), b1d948c (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:

Michele Selvaggi <michele.selvaggi@…> (04/11/18 18:26:41)

git-committer:

GitHub <noreply@…> (04/11/18 18:26:41)

Message:

Merge pull request #54 from uschnoor/master

CLICdet cards and code additions ready for release

File:

• modules/FastJetFinder.cc (modified) (5 diffs)

modules/FastJetFinder.cc

@@ -80 +80 @@
 
 FastJetFinder::FastJetFinder() :
-  fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), 
-  fDefinition(0), fAreaDefinition(0), fItInputArray(0), fValenciaPlugin(0)
+  fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), fValenciaPlugin(0),
+  fDefinition(0), fAreaDefinition(0), fItInputArray(0)
 {
 
@@ -332 +332 @@
   vector< PseudoJet >::iterator itInputList, itOutputList;
   vector< TEstimatorStruct >::iterator itEstimators;
-
+  Double_t excl_ymerge23 = 0.0;
+  Double_t excl_ymerge34 = 0.0;
+  Double_t excl_ymerge45 = 0.0;
+  Double_t excl_ymerge56 = 0.0;
+  
   DelphesFactory *factory = GetFactory();
 
@@ -377 +381 @@
   outputList.clear();
 
+  
   if(fExclusiveClustering)
     {
-      outputList = sorted_by_pt(sequence->exclusive_jets( fNJets ));
+   try{
+     outputList = sorted_by_pt(sequence->exclusive_jets( fNJets ));
+   }
+   catch(fastjet::Error)
+     {
+       outputList.clear();
+     }
+
+      excl_ymerge23 = sequence->exclusive_ymerge( 2 );
+      excl_ymerge34 = sequence->exclusive_ymerge( 3 );
+      excl_ymerge45 = sequence->exclusive_ymerge( 4 );
+      excl_ymerge56 = sequence->exclusive_ymerge( 5 );
     }
   else
@@ -400 +416 @@
     if(fAreaDefinition) area = itOutputList->area_4vector();
 
+
+    
     candidate = factory->NewCandidate();
 
@@ -443 +461 @@
     candidate->NNeutrals = nneutrals;
     candidate->NCharged = ncharged;
+
+
+    //for exclusive clustering, access y_n,n+1 as exclusive_ymerge (fNJets);
+    candidate->ExclYmerge23 = excl_ymerge23;
+    candidate->ExclYmerge34 = excl_ymerge34;
+    candidate->ExclYmerge45 = excl_ymerge45;
+    candidate->ExclYmerge56 = excl_ymerge56;
     
     //------------------------------------