Index: converters/hepmc2pileup.cpp
===================================================================
--- converters/hepmc2pileup.cpp	(revision b8b29f148ead080b96f66cea457a69810ae280c3)
+++ converters/hepmc2pileup.cpp	(revision a1c9c16715c3c733f66a1cb745871927fd9552c5)
@@ -17,19 +17,19 @@
  */
 
-#include <stdexcept>
 #include <iostream>
 #include <sstream>
+#include <stdexcept>
 
 #include <signal.h>
 
+#include "TApplication.h"
 #include "TROOT.h"
-#include "TApplication.h"
 
+#include "TDatabasePDG.h"
 #include "TFile.h"
+#include "TLorentzVector.h"
 #include "TObjArray.h"
+#include "TParticlePDG.h"
 #include "TStopwatch.h"
-#include "TDatabasePDG.h"
-#include "TParticlePDG.h"
-#include "TLorentzVector.h"
 
 #include "classes/DelphesClasses.h"
@@ -38,7 +38,7 @@
 #include "classes/DelphesPileUpWriter.h"
 
+#include "ExRootAnalysis/ExRootProgressBar.h"
+#include "ExRootAnalysis/ExRootTreeBranch.h"
 #include "ExRootAnalysis/ExRootTreeWriter.h"
-#include "ExRootAnalysis/ExRootTreeBranch.h"
-#include "ExRootAnalysis/ExRootProgressBar.h"
 
 using namespace std;
@@ -71,5 +71,6 @@
   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 binary pile-up file," << endl;
     cout << " input_file(s) - input file(s) in HepMC format," << endl;
@@ -142,5 +143,6 @@
       reader->Clear();
       while(reader->ReadBlock(factory, allParticleOutputArray,
-        stableParticleOutputArray, partonOutputArray) && !interrupted)
+              stableParticleOutputArray, partonOutputArray)
+        && !interrupted)
       {
         if(reader->EventReady())
@@ -149,5 +151,5 @@
 
           itParticle->Reset();
-          while((candidate = static_cast<Candidate*>(itParticle->Next())))
+          while((candidate = static_cast<Candidate *>(itParticle->Next())))
           {
             const TLorentzVector &position = candidate->Position;
@@ -173,6 +175,5 @@
 
       ++i;
-    }
-    while(i < argc);
+    } while(i < argc);
 
     writer->WriteIndex();
Index: converters/lhco2root.cpp
===================================================================
--- converters/lhco2root.cpp	(revision b8b29f148ead080b96f66cea457a69810ae280c3)
+++ converters/lhco2root.cpp	(revision a1c9c16715c3c733f66a1cb745871927fd9552c5)
@@ -17,34 +17,34 @@
  */
 
-#include <stdexcept>
 #include <iostream>
 #include <sstream>
-
-#include <stdlib.h>
+#include <stdexcept>
+
 #include <signal.h>
 #include <stdio.h>
-
+#include <stdlib.h>
+
+#include "TApplication.h"
 #include "TROOT.h"
-#include "TApplication.h"
-
+
+#include "TDatabasePDG.h"
 #include "TFile.h"
+#include "TLorentzVector.h"
 #include "TObjArray.h"
+#include "TParticlePDG.h"
 #include "TStopwatch.h"
-#include "TDatabasePDG.h"
-#include "TParticlePDG.h"
-#include "TLorentzVector.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/ExRootProgressBar.h"
+#include "ExRootAnalysis/ExRootTreeBranch.h"
 #include "ExRootAnalysis/ExRootTreeWriter.h"
-#include "ExRootAnalysis/ExRootTreeBranch.h"
-#include "ExRootAnalysis/ExRootProgressBar.h"
 
 using namespace std;
 
-static const int kBufferSize  = 1024;
+static const int kBufferSize = 1024;
 
 /*
@@ -74,5 +74,4 @@
 
 private:
-
   void AddMissingEvents();
 
@@ -86,5 +85,9 @@
   void AnalyseMissingET(ExRootTreeBranch *branch);
 
-  enum {kIntParamSize = 2, kDblParamSize = 7};
+  enum
+  {
+    kIntParamSize = 2,
+    kDblParamSize = 7
+  };
   Int_t fIntParam[kIntParamSize];
   Double_t fDblParam[kDblParamSize];
@@ -106,5 +109,4 @@
   ExRootTreeBranch *fBranchJet;
   ExRootTreeBranch *fBranchMissingET;
-
 };
 
@@ -169,5 +171,6 @@
     if(!rc)
     {
-      cerr << "** ERROR: " << "invalid event format" << endl;
+      cerr << "** ERROR: "
+           << "invalid event format" << endl;
       return kFALSE;
     }
@@ -195,5 +198,6 @@
     if(!rc)
     {
-      cerr << "** ERROR: " << "invalid object format" << endl;
+      cerr << "** ERROR: "
+           << "invalid object format" << endl;
       return kFALSE;
     }
@@ -201,10 +205,10 @@
     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;
     }
   }
@@ -228,5 +232,5 @@
   LHCOEvent *element;
 
-  element = static_cast<LHCOEvent*>(branch->NewEntry());
+  element = static_cast<LHCOEvent *>(branch->NewEntry());
 
   element->Number = fEventNumber;
@@ -240,5 +244,5 @@
   Photon *element;
 
-  element = static_cast<Photon*>(branch->NewEntry());
+  element = static_cast<Photon *>(branch->NewEntry());
 
   element->Eta = fDblParam[0];
@@ -254,5 +258,5 @@
   Electron *element;
 
-  element = static_cast<Electron*>(branch->NewEntry());
+  element = static_cast<Electron *>(branch->NewEntry());
 
   element->Eta = fDblParam[0];
@@ -261,5 +265,5 @@
 
   element->Charge = fDblParam[4] < 0.0 ? -1 : 1;
-/*
+  /*
   element->Ntrk = TMath::Abs(fDblParam[4]);
 */
@@ -273,5 +277,5 @@
   Muon *element;
 
-  element = static_cast<Muon*>(branch->NewEntry());
+  element = static_cast<Muon *>(branch->NewEntry());
 
   element->Eta = fDblParam[0];
@@ -280,5 +284,5 @@
 
   element->Charge = fDblParam[4] < 0.0 ? -1 : 1;
-/*
+  /*
   element->Ntrk = TMath::Abs(fDblParam[4]);
 
@@ -296,5 +300,5 @@
   Jet *element;
 
-  element = static_cast<Jet*>(branch->NewEntry());
+  element = static_cast<Jet *>(branch->NewEntry());
 
   element->Eta = fDblParam[0];
@@ -308,5 +312,5 @@
 
   element->Charge = fDblParam[4] < 0 ? -1 : 1;
-/*
+  /*
   element->Ntrk = TMath::Abs(fDblParam[4]);
 */
@@ -320,5 +324,5 @@
   Jet *element;
 
-  element = static_cast<Jet*>(branch->NewEntry());
+  element = static_cast<Jet *>(branch->NewEntry());
 
   element->Eta = fDblParam[0];
@@ -327,5 +331,5 @@
 
   element->Mass = fDblParam[3];
-/*
+  /*
   element->Ntrk = TMath::Abs(Int_t(fDblParam[4]));
 */
@@ -336,5 +340,5 @@
 
   element->EhadOverEem = fDblParam[6];
-/*
+  /*
   element->Index = fIntParam[0];
 */
@@ -347,5 +351,5 @@
   MissingET *element;
 
-  element = static_cast<MissingET*>(branch->NewEntry());
+  element = static_cast<MissingET *>(branch->NewEntry());
 
   element->Phi = fDblParam[1];
@@ -376,5 +380,6 @@
   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;
@@ -456,6 +461,5 @@
 
       ++i;
-    }
-    while(i < argc);
+    } while(i < argc);
 
     cout << "** Exiting..." << endl;
@@ -474,4 +478,2 @@
   }
 }
-
-
Index: converters/pileup2root.cpp
===================================================================
--- converters/pileup2root.cpp	(revision b8b29f148ead080b96f66cea457a69810ae280c3)
+++ converters/pileup2root.cpp	(revision a1c9c16715c3c733f66a1cb745871927fd9552c5)
@@ -17,31 +17,30 @@
  */
 
-
-#include <stdexcept>
 #include <iostream>
 #include <sstream>
-
-#include <stdlib.h>
+#include <stdexcept>
+
 #include <signal.h>
 #include <stdio.h>
-
+#include <stdlib.h>
+
+#include "TApplication.h"
 #include "TROOT.h"
-#include "TApplication.h"
-
+
+#include "TDatabasePDG.h"
 #include "TFile.h"
+#include "TLorentzVector.h"
 #include "TObjArray.h"
+#include "TParticlePDG.h"
 #include "TStopwatch.h"
-#include "TDatabasePDG.h"
-#include "TParticlePDG.h"
-#include "TLorentzVector.h"
-
-#include "classes/DelphesStream.h"
+
 #include "classes/DelphesClasses.h"
 #include "classes/DelphesFactory.h"
 #include "classes/DelphesPileUpReader.h"
-
+#include "classes/DelphesStream.h"
+
+#include "ExRootAnalysis/ExRootProgressBar.h"
+#include "ExRootAnalysis/ExRootTreeBranch.h"
 #include "ExRootAnalysis/ExRootTreeWriter.h"
-#include "ExRootAnalysis/ExRootTreeBranch.h"
-#include "ExRootAnalysis/ExRootProgressBar.h"
 
 using namespace std;
@@ -62,5 +61,5 @@
   while(reader->ReadParticle(pid, x, y, z, t, px, py, pz, e))
   {
-    particle = static_cast<GenParticle*>(branch->NewEntry());
+    particle = static_cast<GenParticle *>(branch->NewEntry());
 
     particle->PID = pid;
@@ -84,5 +83,5 @@
 
     pdgParticle = pdg->GetParticle(pid);
-    particle->Charge = pdgParticle ? Int_t(pdgParticle->Charge()/3.0) : -999;
+    particle->Charge = pdgParticle ? Int_t(pdgParticle->Charge() / 3.0) : -999;
 
     particle->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
@@ -92,6 +91,6 @@
     cosTheta = TMath::Abs(momentum.CosTheta());
     signPz = (momentum.Pz() >= 0.0) ? 1.0 : -1.0;
-    eta = (cosTheta == 1.0 ? signPz*999.9 : momentum.Eta());
-    rapidity = (cosTheta == 1.0 ? signPz*999.9 : momentum.Rapidity());
+    eta = (cosTheta == 1.0 ? signPz * 999.9 : momentum.Eta());
+    rapidity = (cosTheta == 1.0 ? signPz * 999.9 : momentum.Rapidity());
 
     particle->Eta = eta;
@@ -126,5 +125,6 @@
   if(argc != 3)
   {
-    cout << " Usage: " << appName << " output_file" << " input_file" << endl;
+    cout << " Usage: " << appName << " output_file"
+         << " input_file" << endl;
     cout << " output_file - output file in ROOT format," << endl;
     cout << " input_file - input binary pile-up file." << endl;
@@ -199,4 +199,2 @@
   }
 }
-
-
Index: converters/root2lhco.cpp
===================================================================
--- converters/root2lhco.cpp	(revision b8b29f148ead080b96f66cea457a69810ae280c3)
+++ converters/root2lhco.cpp	(revision a1c9c16715c3c733f66a1cb745871927fd9552c5)
@@ -17,24 +17,24 @@
  */
 
+#include <fstream>
+#include <iostream>
+#include <sstream>
 #include <stdexcept>
-#include <iostream>
-#include <fstream>
-#include <sstream>
 #include <string>
 
-#include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
-
+#include <stdlib.h>
+
+#include "TApplication.h"
 #include "TROOT.h"
-#include "TApplication.h"
-
+
+#include "TClonesArray.h"
 #include "TFile.h"
-#include "TClonesArray.h"
 
 #include "classes/DelphesClasses.h"
 
+#include "ExRootAnalysis/ExRootProgressBar.h"
 #include "ExRootAnalysis/ExRootTreeReader.h"
-#include "ExRootAnalysis/ExRootProgressBar.h"
 
 using namespace std;
@@ -62,5 +62,4 @@
 
 private:
-
   void Reset();
   void Write();
@@ -76,5 +75,9 @@
   void AnalyseMissingET();
 
-  enum {kIntParamSize = 2, kDblParamSize = 9};
+  enum
+  {
+    kIntParamSize = 2,
+    kDblParamSize = 9
+  };
   Int_t fIntParam[kIntParamSize];
   Double_t fDblParam[kDblParamSize];
@@ -132,6 +135,5 @@
   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");
@@ -202,5 +204,5 @@
   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);
@@ -216,5 +218,5 @@
 
   fItPhoton->Reset();
-  while((element = static_cast<Photon*>(fItPhoton->Next())))
+  while((element = static_cast<Photon *>(fItPhoton->Next())))
   {
     Reset();
@@ -239,5 +241,5 @@
 
   fItElectron->Reset();
-  while((element = static_cast<Electron*>(fItElectron->Next())))
+  while((element = static_cast<Electron *>(fItElectron->Next())))
   {
     Reset();
@@ -270,5 +272,5 @@
   muonCounter = 0;
   fItMuon->Reset();
-  while((element = static_cast<Muon*>(fItMuon->Next())))
+  while((element = static_cast<Muon *>(fItMuon->Next())))
   {
     Reset();
@@ -276,5 +278,5 @@
     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;
@@ -283,5 +285,5 @@
     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;
@@ -293,5 +295,5 @@
     minDR = 1.0E9;
     fItJet->Reset();
-    while((jet = static_cast<Jet*>(fItJet->Next())))
+    while((jet = static_cast<Jet *>(fItJet->Next())))
     {
       if(jet->TauTag != 0)
@@ -325,5 +327,5 @@
     }
 
-    ratET = sumET/element->PT;
+    ratET = sumET / element->PT;
     fDblParam[6] = Float_t(TMath::Nint(sumPT)) + (ratET < 1.0 ? ratET : 0.99);
 
@@ -342,5 +344,5 @@
 
   fItJet->Reset();
-  while((element = static_cast<Jet*>(fItJet->Next())))
+  while((element = static_cast<Jet *>(fItJet->Next())))
   {
     if(element->TauTag == 0) continue;
@@ -350,5 +352,5 @@
     counter = 1;
 
-   /*
+    /*
     fItTrack->Reset();
     while((track = static_cast<Track*>(fItTrack->Next())))
@@ -380,5 +382,5 @@
 
   fItJet->Reset();
-  while((element = static_cast<Jet*>(fItJet->Next())))
+  while((element = static_cast<Jet *>(fItJet->Next())))
   {
     if(element->TauTag != 0) continue;
@@ -388,5 +390,5 @@
     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;
@@ -413,5 +415,5 @@
   MissingET *element;
 
-  element = static_cast<MissingET*>(fBranchMissingET->At(0));
+  element = static_cast<MissingET *>(fBranchMissingET->At(0));
 
   Reset();
@@ -471,5 +473,6 @@
   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;
Index: converters/root2pileup.cpp
===================================================================
--- converters/root2pileup.cpp	(revision b8b29f148ead080b96f66cea457a69810ae280c3)
+++ converters/root2pileup.cpp	(revision a1c9c16715c3c733f66a1cb745871927fd9552c5)
@@ -17,22 +17,22 @@
  */
 
-#include <stdexcept>
 #include <iostream>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 
 #include <signal.h>
 
+#include "TApplication.h"
 #include "TROOT.h"
-#include "TApplication.h"
 
+#include "TClonesArray.h"
 #include "TFile.h"
-#include "TClonesArray.h"
 
 #include "classes/DelphesClasses.h"
 #include "classes/DelphesPileUpWriter.h"
 
+#include "ExRootAnalysis/ExRootProgressBar.h"
 #include "ExRootAnalysis/ExRootTreeReader.h"
-#include "ExRootAnalysis/ExRootProgressBar.h"
 
 using namespace std;
@@ -64,5 +64,6 @@
   if(argc < 3)
   {
-    cout << " Usage: " << appName << " output_file" << " input_file(s)" << endl;
+    cout << " Usage: " << appName << " output_file"
+         << " input_file(s)" << endl;
     cout << " output_file - output binary pile-up file," << endl;
     cout << " input_file(s) - input file(s) in ROOT format." << endl;
@@ -108,5 +109,5 @@
 
         itParticle->Reset();
-        while((particle = static_cast<GenParticle*>(itParticle->Next())))
+        while((particle = static_cast<GenParticle *>(itParticle->Next())))
         {
           writer->WriteParticle(particle->PID,
@@ -114,5 +115,5 @@
             particle->Px, particle->Py, particle->Pz, particle->E);
         }
-        
+
         writer->WriteEntry();
 
Index: converters/stdhep2pileup.cpp
===================================================================
--- converters/stdhep2pileup.cpp	(revision b8b29f148ead080b96f66cea457a69810ae280c3)
+++ converters/stdhep2pileup.cpp	(revision a1c9c16715c3c733f66a1cb745871927fd9552c5)
@@ -17,28 +17,28 @@
  */
 
-#include <stdexcept>
 #include <iostream>
 #include <sstream>
+#include <stdexcept>
 
 #include <signal.h>
 
+#include "TApplication.h"
 #include "TROOT.h"
-#include "TApplication.h"
 
+#include "TDatabasePDG.h"
 #include "TFile.h"
+#include "TLorentzVector.h"
 #include "TObjArray.h"
+#include "TParticlePDG.h"
 #include "TStopwatch.h"
-#include "TDatabasePDG.h"
-#include "TParticlePDG.h"
-#include "TLorentzVector.h"
 
 #include "classes/DelphesClasses.h"
 #include "classes/DelphesFactory.h"
+#include "classes/DelphesPileUpWriter.h"
 #include "classes/DelphesSTDHEPReader.h"
-#include "classes/DelphesPileUpWriter.h"
 
+#include "ExRootAnalysis/ExRootProgressBar.h"
+#include "ExRootAnalysis/ExRootTreeBranch.h"
 #include "ExRootAnalysis/ExRootTreeWriter.h"
-#include "ExRootAnalysis/ExRootTreeBranch.h"
-#include "ExRootAnalysis/ExRootProgressBar.h"
 
 using namespace std;
@@ -71,5 +71,6 @@
   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 binary pile-up file," << endl;
     cout << " input_file(s) - input file(s) in STDHEP format," << endl;
@@ -142,5 +143,6 @@
       reader->Clear();
       while(reader->ReadBlock(factory, allParticleOutputArray,
-        stableParticleOutputArray, partonOutputArray) && !interrupted)
+              stableParticleOutputArray, partonOutputArray)
+        && !interrupted)
       {
         if(reader->EventReady())
@@ -149,5 +151,5 @@
 
           itParticle->Reset();
-          while((candidate = static_cast<Candidate*>(itParticle->Next())))
+          while((candidate = static_cast<Candidate *>(itParticle->Next())))
           {
             const TLorentzVector &position = candidate->Position;
@@ -173,6 +175,5 @@
 
       ++i;
-    }
-    while(i < argc);
+    } while(i < argc);
 
     writer->WriteIndex();
