Fork me on GitHub

Changeset 223 in svn


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

include statements have been cleaned ; copy-constructor ; operator= ; destructor

Location:
trunk/interface
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/interface/BFieldProp.h

    r199 r223  
    1313
    1414#include "TLorentzVector.h"
    15 #include "interface/SmearUtil.h"
    16 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
    17 #include "Utilities/ExRootAnalysis/interface/TSimpleArray.h"
     15#include "SmearUtil.h"
     16#include "BlockClasses.h"
     17#include "TSimpleArray.h"
    1818
    1919using namespace std;
    … …  
    2323 public:
    2424  // Constructor
    25     TrackPropagation(const string DetDatacard);
     25    TrackPropagation();
     26    TrackPropagation(const string& DetDatacard);
     27    TrackPropagation(const RESOLution * DetDatacard);
     28    TrackPropagation(const TrackPropagation & tp);
     29    TrackPropagation& operator=(const TrackPropagation & tp);
     30    ~TrackPropagation() {delete DET;};
     31    void init(); // for constructors
    2632 
    2733    void Propagation(const TRootGenParticle *Part,TLorentzVector &genMomentum);

  • trunk/interface/FrogUtil.h

    r97 r223  
    1515/// \brief RESOLution class, and some generic definitions
    1616
    17 #include <iostream>
    18 #include <fstream>
    19 #include <utility>
    20 #include <vector>
    21 #include <math.h>
    22 
    23 #include "TStyle.h"
    24 #include "TPad.h"
    25 #include "TCanvas.h"
    26 #include "TSystem.h"
    27 #include "TArrow.h"
    28 #include "TROOT.h"
    29 #include "TApplication.h"
    30 #include "THStack.h"
    31 #include "stdio.h"
    32 #include "TChain.h"
    33 #include "TString.h"
    34 #include "TGraphErrors.h"
    35 #include "TClonesArray.h"
    36 #include "TFile.h"
    37 #include "TH2.h"
    38 #include "THStack.h"
    39 #include "TLegend.h"
    40 #include "TPaveText.h"
    41 #include "TLorentzVector.h"
    42 #include "TTree.h"
    43 #include "TBranch.h"
    44 #include "TRandom.h"
    45 
    46 #include "interface/SmearUtil.h"
    47 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
    48 
    49 #include "Utilities/ExRootAnalysis/interface/ExRootTreeReader.h"
    50 #include "Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h"
    51 #include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
    52 
    53 #include "Utilities/FROG/Includes/FROG/FROG_Events.h"
     17#include "SmearUtil.h"
     18#include "FROG_Events.h"
    5419
    5520
    5621using namespace std;
    57 class FrogDisplay
    58 {
     22class FrogDisplay {
     23
    5924 public:
    60   /// Constructor
    61   FrogDisplay();
     25   /// Constructor
     26   FrogDisplay();
     27   FrogDisplay(const string& DetDatacard);
     28   FrogDisplay(const RESOLution* DetDatacard);
     29   FrogDisplay(const FrogDisplay& frog);
     30   FrogDisplay& operator=(const FrogDisplay& frog);
     31   ~FrogDisplay() {delete DET;}
    6232
    63   void Build_1Event(FROG_Element_Event* event1);
    64   void BuidEvents(string outputfilename,int nEntryFrog);
    65   void BuildGeom(string DetDatacard);
     33  void BuildEvents(const string& outputfilename);
     34  void BuildGeom();
     35
     36 private:
     37   RESOLution *DET;
     38   unsigned int nEntryFrog;
    6639
    6740};

  • trunk/interface/SmearUtil.h

    r198 r223  
    1919#include "TLorentzVector.h"
    2020
    21 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
    22 #include "Utilities/ExRootAnalysis/interface/TSimpleArray.h"
    23 
    24 #include "Utilities/Fastjet/plugins/CDFCones/interface/PhysicsTower.hh"
    25 
    26 #include <iostream>
    27 #include <sstream>
    28 #include <fstream>
    29 #include <iomanip>
     21#include "BlockClasses.h"
     22#include "TSimpleArray.h"
     23#include "PhysicsTower.hh"
    3024
    3125using namespace std;
    … …  
    3428
    3529 public:
    36   ParticleUtil(const TLorentzVector &genMomentum,const int &pid) : TLVector(genMomentum) , Pid(pid) {}
    37 
    38   float E() {return TLVector.E();}    // particle energy [GeV]
    39   float Px() {return TLVector.Px();}  // horizontal coordinate of momentum [GeV]
    40   float Py() {return TLVector.Py();}  // vertical coordinate of momentum [GeV]
    41   float Pz() {return TLVector.Pz();}  // longitudinal coordinate of momentum [GeV]
    42   float Pt() {return TLVector.Pt();}  // transverse momentum [GeV]
    43   float Eta() {return TLVector.Eta();}  // pseudorapidity [GeV]
    44   float Phi() {return TLVector.Phi();}  // azimuthal angle [GeV]
    45   float PID() {return Pid;}  // particle energy in [GeV]
     30  ParticleUtil(const TLorentzVector &genMomentum, int pid);
     31
     32  float E() {return _e;}    // particle energy [GeV]
     33  float Px() {return _px;}  // horizontal coordinate of momentum [GeV]
     34  float Py() {return _py;}  // vertical coordinate of momentum [GeV]
     35  float Pz() {return _pz;}  // longitudinal coordinate of momentum [GeV]
     36  float Pt() {return _pt;}  // transverse momentum [GeV]
     37  float EtaCalo() {return _etaCalo;}  // pseudorapidity
     38  float Eta() {return _eta;}  // pseudorapidity
     39  float PhiCalo() {return _phiCalo;}  // azimuthal angle
     40  float Phi() {return _phi;}  // azimuthal angle
     41  int PID() {return _pid;}  // particle energy in [GeV]
    4642
    4743 private:
    48   TLorentzVector TLVector;
    49   int Pid;
     44  float _e, _px, _py, _pz, _pt;
     45  float _eta, _etaCalo, _phi, _phiCalo;
     46  int _pid;
    5047};
    5148
    … …  
    5653  /// Constructor
    5754  RESOLution();
    58  
     55  RESOLution(const RESOLution & DET);
     56  RESOLution& operator=(const RESOLution& DET);
     57  ~RESOLution() { delete [] TOWER_eta_edges; delete [] TOWER_dphi;};
     58 
    5959  // Detector coverage
    6060  float CEN_max_tracker;    // tracker pseudorapidity coverage
    … …  
    155155 
    156156 int NEvents_Frog;
    157 
    158 
    159 
    160 
    161 
    162157  float PT_QUARKS_MIN;    // minimal pt needed for quarks to reach the tracker, in GeV
    163158
    … …  
    169164 
    170165  /// Create the output log file
    171   void Logfile(string LogName);
     166  void Logfile(const string& LogName);
    172167 
    173168  /// Provides the smeared TLorentzVector for the electrons
    … …  
    180175  void SmearHadron(TLorentzVector &hadron, const float frac);
    181176 
    182   //*****************************fonction pour avoir les taus************************************
     177  /// For electromagnetic collimation in tau jets
    183178  double EnergySmallCone(const vector<PhysicsTower> &towers, const float eta, const float phi);
    184179
    185   //***************** Fonction pour avoir le nombre de traces pour les taus****************************
     180  /// Number of tracks in tau jet algo
    186181  unsigned int NumTracks(const vector<TLorentzVector> &tracks, const float pt_track, const float eta, const float phi);
    187182
    188   //**********************fonction pour avoir les b-jets******************************
     183  /// b-jets
    189184  int Bjets(const TSimpleArray<TRootGenParticle> &subarray, const float eta, const float phi);
    190185 
    191   //******************** retourne l'efficacite de b-tagging ******************************
     186  /// b-tag efficiency and misidentification
    192187  bool Btaggedjet(const TLorentzVector &JET, const TSimpleArray<TRootGenParticle> &subarray);
    193188
    194   //******************************isolation criteria**************************************
    195   bool Isolation(Float_t phi,Float_t eta,const vector<TLorentzVector> &tracks,float PT_TRACK2);
     189  /// Lepton isolation
     190  bool Isolation(const float phi, const float eta,const vector<TLorentzVector> &tracks,float PT_TRACK2);
    196191
    197192  //********************* returns a segmented value for eta and phi, for calo towers *****
    … …  
    226221
    227222const double speed_of_light = 299792458; // m/s
     223const float UNDEFINED=-9999.;
     224
    228225
    229226#ifndef __PI__

  • trunk/interface/VeryForward.h

    r100 r223  
    1717
    1818#include <vector>
    19 #include "TLorentzVector.h"
    2019
    21 #include "interface/SmearUtil.h"
    22 
    23 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
    24 #include "Utilities/ExRootAnalysis/interface/TSimpleArray.h"
    25 #include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
    26 #include "Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h"
    27 
     20#include "SmearUtil.h"
     21#include "BlockClasses.h"
     22#include "ExRootTreeBranch.h"
     23#include "ExRootTreeWriter.h"
    2824#include "H_BeamParticle.h"
    2925#include "H_BeamLine.h"
    30 #include "H_RomanPot.h"
    31 
    32 
    33 #include "Utilities/Fastjet/plugins/CDFCones/interface/PhysicsTower.hh"
     26#include "PhysicsTower.hh"
    3427
    3528using namespace std;
    … …  
    3932 public:
    4033  /// Constructor
    41   VeryForward(string DetDatacard);
     34   VeryForward();
     35   VeryForward(const string& DetDatacard);
     36   VeryForward(const RESOLution * DetDatacard);
     37   VeryForward(const VeryForward& vf);
     38   VeryForward& operator=(const VeryForward& vf);
     39   void init();
     40   ~VeryForward() {delete DET; /*delete beamline1; delete beamline2;*/}; //known memory leak in Hector. Should first be fixed in Hector
    4241
    43   void ZDC(ExRootTreeWriter *treeWriter,ExRootTreeBranch *branchZDC,TRootGenParticle *particle);
    44   void RomanPots(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchRP220,ExRootTreeBranch *branchFP420,TRootGenParticle *particle) ;
     42   void ZDC(ExRootTreeWriter *treeWriter,ExRootTreeBranch *branchZDC,TRootGenParticle *particle);
     43   void RomanPots(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchRP220,ExRootTreeBranch *branchFP420,TRootGenParticle *particle) ;
    4544
    46   bool relative_energy;
    47   int kickers_on;
    48 
    49  H_BeamLine* beamline1;
    50  H_BeamLine* beamline2;
     45   bool relative_energy;
     46   int kickers_on;
    5147
    5248 private:
    53  
    54  RESOLution *DET;
     49   H_BeamLine* beamline1;
     50   H_BeamLine* beamline2;
     51   RESOLution *DET;
    5552
    5653};
Note: See TracChangeset for help on using the changeset viewer.