Fork me on GitHub

Changeset 220 in svn


Ignore:
Timestamp:
Feb 2, 2009, 12:34:35 PM (16 years ago)
Author:
Xavier Rouby
Message:

include statements have been cleaned

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h

    r192 r220  
    1313 *  present in the data members of the Block TRoot class.
    1414 *
    15  *  $Date: 2009-01-26 14:43:09 $
    16  *  $Revision: 1.10 $
     15 *  $Date: 2009-02-02 11:32:12 $
     16 *  $Revision: 1.11 $
    1717 *
    1818 * 
    … …  
    2121 */
    2222
    23 // Dependencies (#includes)
    24 
    2523#include "TLorentzVector.h"
    26 #include "TRef.h"
    2724#include "TObject.h"
    28 #include "TRefArray.h"
    29 
    30 #include "Utilities/ExRootAnalysis/interface/BlockCompare.h"
    31 //---------------------------------------------------------------------------
    32 //
     25#include "BlockCompare.h"
     26
    3327class TSortableObject: public TObject
    3428{
    … …  
    4236  ClassDef(TSortableObject, 1)
    4337};
    44 
    4538
    4639//---------------------------------------------------------------------------

  • trunk/Utilities/ExRootAnalysis/interface/BlockCompare.h

    r3 r220  
    66 *  Definition of comparison object functions for block classes
    77 *
    8  *  $Date: 2008-11-04 10:32:25 $
    9  *  $Revision: 1.1 $
     8 *  $Date: 2009-02-02 11:32:12 $
     9 *  $Revision: 1.2 $
    1010 *
    1111 * 
    … …  
    1313 *
    1414 */
    15 
    16 // Dependencies (#includes)
    1715
    1816#include "Rtypes.h"

  • trunk/Utilities/ExRootAnalysis/interface/ExRootTreeReader.h

    r3 r220  
    66 *  Class simplifying access to ROOT tree branches
    77 *
    8  *  $Date: 2008-11-04 10:32:26 $
    9  *  $Revision: 1.1 $
     8 *  $Date: 2009-02-02 11:32:12 $
     9 *  $Revision: 1.2 $
    1010 *
    1111 *
    … …  
    1515
    1616#include "TROOT.h"
    17 #include "TChain.h"
    18 #include "TFile.h"
     17//#include "TChain.h"
     18//#include "TFile.h"
     19#include "TTree.h"
     20#include "TString.h"
    1921
    2022#include <map>

  • trunk/Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h

    r3 r220  
    66 *  Class handling output ROOT tree
    77 *
    8  *  $Date: 2008-11-04 10:32:26 $
    9  *  $Revision: 1.1 $
     8 *  $Date: 2009-02-02 11:32:12 $
     9 *  $Revision: 1.2 $
    1010 *
    1111 *
    … …  
    1515
    1616#include "TString.h"
    17  
    1817#include <set>
    1918

  • trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc

    r176 r220  
    1111 *  to preserve mother-dautherlinks between particles.
    1212 *
    13  *  $Date: 2009-01-12 23:36:06 $
    14  *  $Revision: 1.6 $
     13 *  $Date: 2009-02-02 11:32:01 $
     14 *  $Revision: 1.7 $
    1515 *
    1616 * 
    … …  
    1919 */
    2020
    21 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
    22 #include "Utilities/ExRootAnalysis/interface/BlockCompare.h"
    23 
     21#include "BlockClasses.h"
     22#include "BlockCompare.h"
    2423#include "TLorentzVector.h"
    2524

  • trunk/Utilities/ExRootAnalysis/src/ExRootProgressBar.cc

    r3 r220  
    44 *  Class showing progress bar
    55 *
    6  *  $Date: 2008-11-04 10:32:27 $
    7  *  $Revision: 1.1 $
     6 *  $Date: 2009-02-02 11:32:01 $
     7 *  $Revision: 1.2 $
    88 *
    99 *
    … …  
    1212 */
    1313
    14 #include "Utilities/ExRootAnalysis/interface/ExRootProgressBar.h"
    15 
     14#include "ExRootProgressBar.h"
    1615#include "TSystem.h"
    17 
    18 #include <iostream>
    19 
    20 #include <string.h>
    21 #include <stdio.h>
     16#include <cstdio>
    2217
    2318using namespace std;

  • trunk/Utilities/ExRootAnalysis/src/ExRootTreeBranch.cc

    r3 r220  
    44*  Class handling output ROOT tree branch
    55*
    6 *  $Date: 2008-11-04 10:32:27 $
    7 *  $Revision: 1.1 $
     6*  $Date: 2009-02-02 11:32:01 $
     7*  $Revision: 1.2 $
    88*
    99*
    … …  
    1212*/
    1313
    14 #include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
    15 
    16 #include "TFile.h"
     14#include "ExRootTreeBranch.h"
    1715#include "TTree.h"
    1816#include "TClonesArray.h"
    19 
    20 #include <iostream>
    21 
    22 using namespace std;
    2317
    2418//------------------------------------------------------------------------------

  • trunk/Utilities/ExRootAnalysis/src/ExRootTreeReader.cc

    r3 r220  
    44 *  Class simplifying access to ROOT tree branches
    55 *
    6  *  $Date: 2008-11-04 10:32:27 $
    7  *  $Revision: 1.1 $
     6 *  $Date: 2009-02-02 11:32:01 $
     7 *  $Revision: 1.2 $
    88 *
    99 *
    … …  
    1212 */
    1313
    14 #include "Utilities/ExRootAnalysis/interface/ExRootTreeReader.h"
    15 
    16 #include "TH2.h"
    17 #include "TStyle.h"
    18 #include "TCanvas.h"
     14#include "ExRootTreeReader.h"
    1915#include "TBranchElement.h"
    2016#include "TClonesArray.h"
    21 
     17#include "TChain.h"
    2218#include <iostream>
    2319

  • trunk/Utilities/ExRootAnalysis/src/ExRootTreeWriter.cc

    r3 r220  
    44 *  Class handling output ROOT tree
    55 *
    6  *  $Date: 2008-11-04 10:32:27 $
    7  *  $Revision: 1.1 $
     6 *  $Date: 2009-02-02 11:32:01 $
     7 *  $Revision: 1.2 $
    88 *
    99 *
    … …  
    1212 */
    1313
    14 #include "Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h"
    15 #include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
     14#include "ExRootTreeWriter.h"
     15#include "ExRootTreeBranch.h"
    1616
    17 #include "TROOT.h"
    1817#include "TFile.h"
    1918#include "TTree.h"
    20 #include "TClonesArray.h"
    21 
    2219#include <iostream>
    2320

  • trunk/interface/HEPEVTConverter.h

    r11 r220  
    1414/// \file SmearUtil.h
    1515/// \brief HEPEVTConverter class, and some generic definitions
     16#include <deque>
    1617
    17 
    18 #include <iostream>
    19 #include <sstream>
    20 #include <deque>
    21 #include <fstream>
    22 #include <vector>
    23 
    24 #include "TLorentzVector.h"
    25 #include "TRandom.h"
    26 
    27 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
    28 #include "Utilities/ExRootAnalysis/interface/TSimpleArray.h"
    29 //#include "Utilities/CDFCones/interface/PhysicsTower.h"
    30 #include "interface/DataConverter.h"
     18#include "BlockClasses.h"
     19#include "TSimpleArray.h"
     20#include "DataConverter.h"
    3121using namespace std;
    3222

  • trunk/interface/LHEFConverter.h

    r2 r220  
    1717#include <string>
    1818
    19 #include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
    20 #include "Utilities/ExRootAnalysis/interface/LHEF.h"
    21 
    22 #include "interface/DataConverter.h"
     19#include "ExRootTreeBranch.h"
     20#include "LHEF.h"
     21#include "DataConverter.h"
    2322
    2423

  • trunk/interface/STDHEPConverter.h

    r11 r220  
    1616
    1717
    18 #include <iostream>
    19 #include <sstream>
    20 #include <fstream>
    21 #include <vector>
    2218#include <string>
    23 
    24 #include "TLorentzVector.h"
    25 #include "TRandom.h"
    26 
    27 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
    28 #include "Utilities/ExRootAnalysis/interface/TSimpleArray.h"
    29 //#include "Utilities/CDFCones/interface/PhysicsTower.h"
    30 #include "Utilities/ExRootAnalysis/interface/LHEF.h"
    31 
    32 #include "interface/DataConverter.h"
     19#include "DataConverter.h"
    3320
    3421using namespace std;
    3522
    36 class STDHEPConverter : public DataConverter
    37 {
    38 public:
     23class STDHEPConverter : public DataConverter {
     24  public:
     25    STDHEPConverter(const string& inputFileList, const string& outputFileName);
     26    ~STDHEPConverter();
    3927
    40   STDHEPConverter(const string& inputFileList, const string& outputFileName);
    41   ~STDHEPConverter();
    42 
    43 private:
    44   void AnalyseEvent(ExRootTreeBranch *branch, const Long64_t eventNumber);
    45   void AnalyseParticles(ExRootTreeBranch *branch);
    46 
    47 
    48 
     28  private:
     29    void AnalyseEvent(ExRootTreeBranch *branch, const Long64_t eventNumber);
     30    void AnalyseParticles(ExRootTreeBranch *branch);
    4931};
    5032

  • trunk/src/HEPEVTConverter.cc

    r56 r220  
    66
    77#include "TROOT.h"
    8 #include "TApplication.h"
    9 #include "TFile.h"
    108#include "TTree.h"
    119#include "TBranch.h"
    … …  
    1513#include "TChain.h"
    1614
    17 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
    18 #include "Utilities/ExRootAnalysis/interface/ExRootTreeReader.h"
    19 #include "Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h"
    20 #include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
    21 
    22 #include "interface/HEPEVTConverter.h"
     15#include "BlockClasses.h"
     16#include "ExRootTreeWriter.h"
     17#include "ExRootTreeBranch.h"
     18
     19#include "HEPEVTConverter.h"
    2320
    2421using namespace std;

  • trunk/src/STDHEPConverter.cc

    r56 r220  
     1/*
     2  ---- Delphes ----
     3  A Fast Simulator for general purpose LHC detector
     4  S. Ovyn ~~~~ severine.ovyn@uclouvain.be
     5
     6  Center for Particle Physics and Phenomenology (CP3)
     7  Universite Catholique de Louvain (UCL)
     8  Louvain-la-Neuve, Belgium
     9*/
     10
    111#include <iostream>
    2 #include <utility>
    3 #include <deque>
    4 #include <sstream>
    512#include <fstream>
    6 
    7 #include "TROOT.h"
    8 #include "TApplication.h"
    9 #include "TFile.h"
    10 #include "TTree.h"
    11 #include "TBranch.h"
    12 #include "TLeaf.h"
    1313#include "TLorentzVector.h"
    14 #include "TChain.h"
    15 
    16 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
    17 #include "Utilities/ExRootAnalysis/interface/ExRootTreeReader.h"
    18 #include "Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h"
    19 #include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
    20 #include "Utilities/ExRootAnalysis/interface/LHEF.h"
    21 #include "Utilities/stdhep/stdhep_mcfio.h"
    22 #include "Utilities/stdhep/stdhep_declarations.h"
    23 
    24 #include "interface/STDHEPConverter.h"
    25 
    26 
     14#include "BlockClasses.h"
     15#include "ExRootTreeWriter.h"
     16#include "ExRootTreeBranch.h"
     17#include "stdhep_mcfio.h"
     18#include "stdhep_declarations.h"
     19#include "STDHEPConverter.h"
    2720
    2821using namespace std;
    … …  
    5144  for(number = 0; number < myhepevt.nhep; ++number)
    5245  {
    53 
    5446    element = static_cast<TRootGenParticle*>(branch->NewEntry());
    5547
Note: See TracChangeset for help on using the changeset viewer.