Changes in converters/lhco2root.cpp [341014c:1fa50c2] in git

File:

• converters/lhco2root.cpp (modified) (22 diffs)

converters/lhco2root.cpp

@@ -17 +17 @@
  */
 
+#include <stdexcept>
 #include <iostream>
 #include <sstream>
-#include <stdexcept>
-
+
+#include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
-
+
+#include "TROOT.h"
 #include "TApplication.h"
-#include "TROOT.h"
-
+
+#include "TFile.h"
+#include "TObjArray.h"
+#include "TStopwatch.h"
 #include "TDatabasePDG.h"
-#include "TFile.h"
+#include "TParticlePDG.h"
 #include "TLorentzVector.h"
-#include "TObjArray.h"
-#include "TParticlePDG.h"
-#include "TStopwatch.h"
-
+
+#include "modules/Delphes.h"
+#include "classes/DelphesStream.h"
 #include "classes/DelphesClasses.h"
 #include "classes/DelphesFactory.h"
-#include "classes/DelphesStream.h"
-#include "modules/Delphes.h"
-
+
+#include "ExRootAnalysis/ExRootTreeWriter.h"
+#include "ExRootAnalysis/ExRootTreeBranch.h"
 #include "ExRootAnalysis/ExRootProgressBar.h"
-#include "ExRootAnalysis/ExRootTreeBranch.h"
-#include "ExRootAnalysis/ExRootTreeWriter.h"
 
 using namespace std;
 
-static const int kBufferSize = 1024;
+static const int kBufferSize  = 1024;
 
 /*
@@ -74 +74 @@
 
 private:
+
   void AddMissingEvents();
 
@@ -85 +86 @@
   void AnalyseMissingET(ExRootTreeBranch *branch);
 
-  enum
-  {
-    kIntParamSize = 2,
-    kDblParamSize = 7
-  };
+  enum {kIntParamSize = 2, kDblParamSize = 7};
   Int_t fIntParam[kIntParamSize];
   Double_t fDblParam[kDblParamSize];
@@ -109 +106 @@
   ExRootTreeBranch *fBranchJet;
   ExRootTreeBranch *fBranchMissingET;
+
 };
 
@@ -171 +169 @@
     if(!rc)
     {
-      cerr << "** ERROR: "
-           << "invalid event format" << endl;
+      cerr << "** ERROR: " << "invalid event format" << endl;
       return kFALSE;
     }
@@ -198 +195 @@
     if(!rc)
     {
-      cerr << "** ERROR: "
-           << "invalid object format" << endl;
+      cerr << "** ERROR: " << "invalid object format" << endl;
       return kFALSE;
     }
@@ -205 +201 @@
     switch(fIntParam[1])
     {
-    case 0: AnalysePhoton(fBranchPhoton); break;
-    case 1: AnalyseElectron(fBranchElectron); break;
-    case 2: AnalyseMuon(fBranchMuon); break;
-    case 3: AnalyseTau(fBranchJet); break;
-    case 4: AnalyseJet(fBranchJet); break;
-    case 6: AnalyseMissingET(fBranchMissingET); break;
+      case 0: AnalysePhoton(fBranchPhoton); break;
+      case 1: AnalyseElectron(fBranchElectron); break;
+      case 2: AnalyseMuon(fBranchMuon); break;
+      case 3: AnalyseTau(fBranchJet); break;
+      case 4: AnalyseJet(fBranchJet); break;
+      case 6: AnalyseMissingET(fBranchMissingET); break;
     }
   }
@@ -232 +228 @@
   LHCOEvent *element;
 
-  element = static_cast<LHCOEvent *>(branch->NewEntry());
+  element = static_cast<LHCOEvent*>(branch->NewEntry());
 
   element->Number = fEventNumber;
@@ -244 +240 @@
   Photon *element;
 
-  element = static_cast<Photon *>(branch->NewEntry());
+  element = static_cast<Photon*>(branch->NewEntry());
 
   element->Eta = fDblParam[0];
@@ -258 +254 @@
   Electron *element;
 
-  element = static_cast<Electron *>(branch->NewEntry());
+  element = static_cast<Electron*>(branch->NewEntry());
 
   element->Eta = fDblParam[0];
@@ -265 +261 @@
 
   element->Charge = fDblParam[4] < 0.0 ? -1 : 1;
-  /*
+/*
   element->Ntrk = TMath::Abs(fDblParam[4]);
 */
@@ -277 +273 @@
   Muon *element;
 
-  element = static_cast<Muon *>(branch->NewEntry());
+  element = static_cast<Muon*>(branch->NewEntry());
 
   element->Eta = fDblParam[0];
@@ -284 +280 @@
 
   element->Charge = fDblParam[4] < 0.0 ? -1 : 1;
-  /*
+/*
   element->Ntrk = TMath::Abs(fDblParam[4]);
 
@@ -300 +296 @@
   Jet *element;
 
-  element = static_cast<Jet *>(branch->NewEntry());
+  element = static_cast<Jet*>(branch->NewEntry());
 
   element->Eta = fDblParam[0];
@@ -312 +308 @@
 
   element->Charge = fDblParam[4] < 0 ? -1 : 1;
-  /*
+/*
   element->Ntrk = TMath::Abs(fDblParam[4]);
 */
@@ -324 +320 @@
   Jet *element;
 
-  element = static_cast<Jet *>(branch->NewEntry());
+  element = static_cast<Jet*>(branch->NewEntry());
 
   element->Eta = fDblParam[0];
@@ -331 +327 @@
 
   element->Mass = fDblParam[3];
-  /*
+/*
   element->Ntrk = TMath::Abs(Int_t(fDblParam[4]));
 */
@@ -340 +336 @@
 
   element->EhadOverEem = fDblParam[6];
-  /*
+/*
   element->Index = fIntParam[0];
 */
@@ -351 +347 @@
   MissingET *element;
 
-  element = static_cast<MissingET *>(branch->NewEntry());
+  element = static_cast<MissingET*>(branch->NewEntry());
 
   element->Phi = fDblParam[1];
@@ -380 +376 @@
   if(argc < 2)
   {
-    cout << " Usage: " << appName << " output_file"
-         << " [input_file(s)]" << endl;
+    cout << " Usage: " << appName << " output_file" << " [input_file(s)]" << endl;
     cout << " output_file - output file in ROOT format," << endl;
     cout << " input_file(s) - input file(s) in LHCO format," << endl;
@@ -461 +456 @@
 
       ++i;
-    } while(i < argc);
+    }
+    while(i < argc);
 
     cout << "** Exiting..." << endl;
@@ -478 +474 @@
   }
 }
+
+