Changes in / [b8a3b20:7a1e27d] in git

File:

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

converters/root2lhco.cpp

@@ -56 +56 @@
 {
 public:
-  LHCOWriter(ExRootTreeReader *treeReader, FILE *outputFile, string JetBranchName);
+  LHCOWriter(ExRootTreeReader *treeReader, FILE *outputFile);
   ~LHCOWriter();
 
@@ -107 +107 @@
 //------------------------------------------------------------------------------
 
-LHCOWriter::LHCOWriter(ExRootTreeReader *treeReader, FILE *outputFile, string JetBranchName) :
+LHCOWriter::LHCOWriter(ExRootTreeReader *treeReader, FILE *outputFile) :
   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("Jet");
   // 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[])
 {
@@ -474 +445 @@
   ExRootTreeReader *treeReader = 0;
   Long64_t entry, allEntries;
-  string  JetBranchName="Jet";
-
-  if(argc < 2 || argc > 4)
-  {
-    cerr << " Usage: " << appName << " input_file" << " [output_file]  [--jet-branch=Jet]" << endl;
+
+  if(argc < 2 || argc > 3)
+  {
+    cerr << " Usage: " << appName << " input_file" << " [output_file]" << 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);
@@ -539 +494 @@
     {
       // Create LHC Olympics converter:
-      writer = new LHCOWriter(treeReader, outputFile, JetBranchName);
+      writer = new LHCOWriter(treeReader, outputFile);
 
       ExRootProgressBar progressBar(allEntries - 1);
@@ -576 +531 @@
   }
 }
+
+