Changes in converters/root2lhco.cpp [341014c:c3547ed] in git

File:

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

converters/root2lhco.cpp

@@ -17 +17 @@
  */
 
+#include <stdexcept>
+#include <iostream>
 #include <fstream>
-#include <iostream>
 #include <sstream>
-#include <stdexcept>
 #include <string>
 
+#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 "TClonesArray.h"
-#include "TFile.h"
 
 #include "classes/DelphesClasses.h"
 
+#include "ExRootAnalysis/ExRootTreeReader.h"
 #include "ExRootAnalysis/ExRootProgressBar.h"
-#include "ExRootAnalysis/ExRootTreeReader.h"
 
 using namespace std;
@@ -62 +62 @@
 
 private:
+
   void Reset();
   void Write();
@@ -75 +76 @@
   void AnalyseMissingET();
 
-  enum
-  {
-    kIntParamSize = 2,
-    kDblParamSize = 9
-  };
+  enum {kIntParamSize = 2, kDblParamSize = 9};
   Int_t fIntParam[kIntParamSize];
   Double_t fDblParam[kDblParamSize];
@@ -135 +132 @@
   fBranchMissingET = fTreeReader->UseBranch("MissingET");
 
-  if(!fBranchEvent || !fBranchTrack || !fBranchTower || !fBranchPhoton || !fBranchElectron || !fBranchMuon || !fBranchJet || !fBranchMissingET)
+  if(!fBranchEvent || !fBranchTrack || !fBranchTower || !fBranchPhoton ||
+     !fBranchElectron || !fBranchMuon || !fBranchJet || !fBranchMissingET)
   {
     throw runtime_error("ROOT file doesn't contain all required branches");
@@ -204 +202 @@
   Event *element;
 
-  element = static_cast<Event *>(fBranchEvent->At(0));
+  element = static_cast<Event*>(fBranchEvent->At(0));
 
   fprintf(fOutputFile, "%4d %13lld %8d\n", 0, element->Number, 0);
@@ -218 +216 @@
 
   fItPhoton->Reset();
-  while((element = static_cast<Photon *>(fItPhoton->Next())))
+  while((element = static_cast<Photon*>(fItPhoton->Next())))
   {
     Reset();
@@ -241 +239 @@
 
   fItElectron->Reset();
-  while((element = static_cast<Electron *>(fItElectron->Next())))
+  while((element = static_cast<Electron*>(fItElectron->Next())))
   {
     Reset();
@@ -272 +270 @@
   muonCounter = 0;
   fItMuon->Reset();
-  while((element = static_cast<Muon *>(fItMuon->Next())))
+  while((element = static_cast<Muon*>(fItMuon->Next())))
   {
     Reset();
@@ -278 +276 @@
     sumPT = 0.0;
     fItTrack->Reset();
-    while((track = static_cast<Track *>(fItTrack->Next())))
+    while((track = static_cast<Track*>(fItTrack->Next())))
     {
       if(element->P4().DeltaR(track->P4()) < 0.5) sumPT += track->PT;
@@ -285 +283 @@
     sumET = 0.0;
     fItTower->Reset();
-    while((tower = static_cast<Tower *>(fItTower->Next())))
+    while((tower = static_cast<Tower*>(fItTower->Next())))
     {
       if(element->P4().DeltaR(tower->P4()) < 0.5) sumET += tower->ET;
@@ -295 +293 @@
     minDR = 1.0E9;
     fItJet->Reset();
-    while((jet = static_cast<Jet *>(fItJet->Next())))
+    while((jet = static_cast<Jet*>(fItJet->Next())))
     {
       if(jet->TauTag != 0)
@@ -327 +325 @@
     }
 
-    ratET = sumET / element->PT;
+    ratET = sumET/element->PT;
     fDblParam[6] = Float_t(TMath::Nint(sumPT)) + (ratET < 1.0 ? ratET : 0.99);
 
@@ -344 +342 @@
 
   fItJet->Reset();
-  while((element = static_cast<Jet *>(fItJet->Next())))
+  while((element = static_cast<Jet*>(fItJet->Next())))
   {
     if(element->TauTag == 0) continue;
@@ -352 +350 @@
     counter = 1;
 
-    /*
+   /*
     fItTrack->Reset();
     while((track = static_cast<Track*>(fItTrack->Next())))
@@ -382 +380 @@
 
   fItJet->Reset();
-  while((element = static_cast<Jet *>(fItJet->Next())))
+  while((element = static_cast<Jet*>(fItJet->Next())))
   {
     if(element->TauTag != 0) continue;
@@ -390 +388 @@
     counter = 0;
     fItTrack->Reset();
-    while((track = static_cast<Track *>(fItTrack->Next())))
+    while((track = static_cast<Track*>(fItTrack->Next())))
     {
       if(element->P4().DeltaR(track->P4()) < 0.5) ++counter;
@@ -415 +413 @@
   MissingET *element;
 
-  element = static_cast<MissingET *>(fBranchMissingET->At(0));
+  element = static_cast<MissingET*>(fBranchMissingET->At(0));
 
   Reset();
@@ -473 +471 @@
   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;