Changeset 8c3ac78 in git

Timestamp:

Apr 11, 2018, 6:26:41 PM (6 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

Files:

• .gitignore (added)
• Makefile (modified) (2 diffs)
• cards/CLIC/CLICdet_BTag_50.tcl (added)
• cards/CLIC/CLICdet_BTag_70.tcl (added)
• cards/CLIC/CLICdet_BTag_90.tcl (added)
• cards/CLIC/CLICdet_BTagging.tcl (added)
• cards/CLIC/CLICdet_JetFlavorAssociation.tcl (added)
• cards/CLIC/CLICdet_JetReco.tcl (added)
• cards/CLIC/CLICdet_JetScale.tcl (added)
• cards/CLIC/CLICdet_JetScale_1500.tcl (added)
• cards/CLIC/CLICdet_JetSmearing.tcl (added)
• cards/CLIC/CLICdet_JetSmearing_1500.tcl (added)
• cards/CLIC/CLICdet_TauTagging.tcl (added)
• cards/delphes_card_CLICdet_Stage1.tcl (added)
• cards/delphes_card_CLICdet_Stage2.tcl (added)
• cards/delphes_card_CLICdet_Stage3.tcl (added)
• classes/DelphesClasses.cc (modified) (1 diff)
• classes/DelphesClasses.h (modified) (2 diffs)
• converters/root2lhco.cpp (modified) (8 diffs)
• modules/FastJetFinder.cc (modified) (5 diffs)
• modules/TreeWriter.cc (modified) (1 diff)

Makefile

@@ -1754 +1754 @@
         external/fastjet/internal/numconsts.hh \
         external/fastjet/PseudoJet.hh \
-        external/fastjet/internal/deprecated.hh \
-        external/fastjet/ClusterSequence.hh
+        external/fastjet/internal/deprecated.hh
         @touch $@
 
@@ -1902 +1901 @@
 display/DelphesBranchElement.h: \
         display/DelphesCaloData.h
+        @touch $@
+
+external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
+        external/fastjet/ClusterSequence.hh \
+        external/fastjet/JetDefinition.hh
         @touch $@
 

classes/DelphesClasses.cc

@@ -157 +157 @@
   NSubJetsPruned(0),
   NSubJetsSoftDropped(0),
+  ExclYmerge23(0),
+  ExclYmerge34(0),
+  ExclYmerge45(0),
+  ExclYmerge56(0),
   fFactory(0),
   fArray(0)

classes/DelphesClasses.h

@@ -396 +396 @@
   TLorentzVector SoftDroppedP4[5]; // first entry (i = 0) is the total SoftDropped Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
 
+
   Int_t NSubJetsTrimmed; // number of subjets trimmed
   Int_t NSubJetsPruned; // number of subjets pruned
   Int_t NSubJetsSoftDropped; // number of subjets soft-dropped
 
+  Double_t ExclYmerge23;
+  Double_t ExclYmerge34;
+  Double_t ExclYmerge45;
+  Double_t ExclYmerge56;
+  
   TRefArray Constituents; // references to constituents
   TRefArray Particles; // references to generated particles
@@ -641 +647 @@
   Int_t NSubJetsSoftDropped; // number of subjets soft-dropped
 
-
+  // Exclusive clustering variables
+  Double_t ExclYmerge23;
+  Double_t ExclYmerge34;
+  Double_t ExclYmerge45;
+  Double_t ExclYmerge56;
+      
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }

converters/root2lhco.cpp

@@ -56 +56 @@
 {
 public:
-  LHCOWriter(ExRootTreeReader *treeReader, FILE *outputFile);
+  LHCOWriter(ExRootTreeReader *treeReader, FILE *outputFile, string JetBranchName);
   ~LHCOWriter();
 
@@ -107 +107 @@
 //------------------------------------------------------------------------------
 
-LHCOWriter::LHCOWriter(ExRootTreeReader *treeReader, FILE *outputFile) :
+LHCOWriter::LHCOWriter(ExRootTreeReader *treeReader, FILE *outputFile, string JetBranchName) :
   fTriggerWord(0), fEventNumber(1), fTreeReader(0), fOutputFile(0),
   fBranchEvent(0), fBranchTrack(0), fBranchTower(0), fBranchPhoton(0),
@@ -128 +128 @@
   fBranchMuon = fTreeReader->UseBranch("Muon");
   // reconstructed jets
-  fBranchJet = fTreeReader->UseBranch("Jet");
+  fBranchJet = fTreeReader->UseBranch(JetBranchName.c_str());
   // missing transverse energy
   fBranchMissingET = fTreeReader->UseBranch("MissingET");
@@ -349 +349 @@
 
     counter = 1;
-   
+
    /*
     fItTrack->Reset();
@@ -436 +436 @@
 //---------------------------------------------------------------------------
 
+pair<string,string> stringToOption(string s) {
+
+        string delimiter = "=";
+
+        vector<string> vs;
+        pair<string,string> res;
+
+        size_t pos = 0;
+        string token;
+        while ((pos = s.find(delimiter)) != std::string::npos) {
+            token = s.substr(0, pos);
+            //cout << token << std::endl;
+                        vs.push_back(token);
+            s.erase(0, pos + delimiter.length());
+        }
+
+        //std::cout << s << std::endl;
+        vs.push_back(s);
+
+        if (vs.size()==2){
+                res.first=vs[0];
+                res.second=vs[1];
+        }
+
+        return res;
+
+}
+
+
 int main(int argc, char *argv[])
 {
@@ -445 +474 @@
   ExRootTreeReader *treeReader = 0;
   Long64_t entry, allEntries;
-
-  if(argc < 2 || argc > 3)
-  {
-    cerr << " Usage: " << appName << " input_file" << " [output_file]" << endl;
+  string  JetBranchName="Jet";
+
+  if(argc < 2 || argc > 4)
+  {
+    cerr << " Usage: " << appName << " input_file" << " [output_file]  [--jet-branch=Jet]" << endl;
     cerr << " input_file - input file in ROOT format," << endl;
     cerr << " output_file - output file in LHCO format," << endl;
     cerr << " with no output_file, or when output_file is -, write to standard output." << endl;
+    cerr << " in order to specify the jet-branch name the output_file cannot be omitted." << endl;
     return 1;
   }
+
+  for(int iarg=3; iarg< argc    ; iarg++){
+
+                string argument=argv[iarg];
+                pair<string,string> option;
+                option=stringToOption(argument);
+
+                if ( option.first == "--jet-branch" ) {
+      JetBranchName = option.second;
+      cout << " Using the jet branch named " << JetBranchName << endl;
+    }
+        }
+  cout << " Using the default jet branch named " << JetBranchName << endl;
+
 
   signal(SIGINT, SignalHandler);
@@ -494 +539 @@
     {
       // Create LHC Olympics converter:
-      writer = new LHCOWriter(treeReader, outputFile);
+      writer = new LHCOWriter(treeReader, outputFile, JetBranchName);
 
       ExRootProgressBar progressBar(allEntries - 1);
@@ -531 +576 @@
   }
 }
-
-

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;
     
     //------------------------------------

modules/TreeWriter.cc

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