Changeset 8c3ac78 in git for converters/root2lhco.cpp

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:

• converters/root2lhco.cpp (modified) (8 diffs)

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 @@
   }
 }
-
-