Changes in converters/root2lhco.cpp [c3547ed:2971ebb] in git

File:

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

converters/root2lhco.cpp

@@ -107 +107 @@
 //------------------------------------------------------------------------------
 
-LHCOWriter::LHCOWriter(ExRootTreeReader *treeReader, FILE *outputFile, string jetBranchName) :
+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(jetBranchName.c_str());
+  fBranchJet = fTreeReader->UseBranch(JetBranchName.c_str());
   // missing transverse energy
   fBranchMissingET = fTreeReader->UseBranch("MissingET");
@@ -436 +436 @@
 //---------------------------------------------------------------------------
 
-vector<string> ArgSplitter(char *arg)
-{
-  string s = arg;
-  string delimiter = "=";
-  vector<string> result;
-  size_t first = 0, last = 0;
-
-  while((last = s.find(delimiter, first)) != string::npos)
-  {
-    result.push_back(s.substr(first, last - first));
-    first = last + delimiter.length();
-  }
-
-  result.push_back(s.substr(first, last));
-
-  return result;
-}
-
-//---------------------------------------------------------------------------
+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[])
 {
-  int i, j;
   char appName[] = "root2lhco";
   stringstream message;
@@ -466 +474 @@
   ExRootTreeReader *treeReader = 0;
   Long64_t entry, allEntries;
-  string jetBranchName = "Jet";
-  vector<string> result;
+  string  JetBranchName="Jet";
 
   if(argc < 2 || argc > 4)
   {
-    cerr << " Usage: " << appName << " input_file" << " [output_file] [--jet-branch=Jet]" << endl;
+    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;
   }
 
-  i = 2;
-  while(i < argc)
-  {
-    result = ArgSplitter(argv[i]);
-
-    if(result.size() == 2 && result[0] == "--jet-branch")
-    {
-      jetBranchName = result[1];
-      for(j = i + 1; j < argc; ++j) argv[j - 1] = argv[j];
-      --argc;
-    }
-    else
-    {
-      ++i;
-    }
-  }
-  cerr << "** Using the jet branch named " << jetBranchName << endl;
+  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);
@@ -535 +539 @@
     {
       // Create LHC Olympics converter:
-      writer = new LHCOWriter(treeReader, outputFile, jetBranchName);
+      writer = new LHCOWriter(treeReader, outputFile, JetBranchName);
 
       ExRootProgressBar progressBar(allEntries - 1);