Changeset e9c0d73 in git for modules

Timestamp:

Dec 5, 2017, 1:11:19 PM (7 years ago)

Author:

Ulrike Schnoor <schnooru@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

0879ed1

Parents:

197fed7

Message:

added exclusive_ymerge for n=2,3,4,5

Location:

modules

Files:

• FastJetFinder.cc (modified) (5 diffs)
• TreeWriter.cc (modified) (1 diff)

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)
     {
-      //not neccessary to sort
-      outputList = sequence->exclusive_jets( fNJets );
+      outputList = sorted_by_pt(sequence->exclusive_jets( fNJets ));
+
+      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
@@ -401 +410 @@
     if(fAreaDefinition) area = itOutputList->area_4vector();
 
+
+    
     candidate = factory->NewCandidate();
 
@@ -444 +455 @@
     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;
     
     //------------------------------------

modules/TreeWriter.cc

@@ -690 +690 @@
     }
 
+    //--- exclusive clustering variables ---
+    entry->ExclYmerge23 = candidate->ExclYmerge23;
+    entry->ExclYmerge34 = candidate->ExclYmerge34;
+    entry->ExclYmerge45 = candidate->ExclYmerge45;
+    entry->ExclYmerge56 = candidate->ExclYmerge56;    
+
+
     FillParticles(candidate, &entry->Particles);
   }