Fork me on GitHub

Changeset dd514ae in git for classes


Ignore:
Timestamp:
06/10/15 16:04:47 (5 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
8707eeb
Parents:
6ec8d18 (diff), 9c491e1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

resolve conflict in DelphesClasses?.h

Location:
classes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • classes/DelphesClasses.cc

    r6ec8d18 rdd514ae  
    4545//------------------------------------------------------------------------------
    4646
    47 TLorentzVector GenParticle::P4()
     47TLorentzVector GenParticle::P4() const
    4848{
    4949  TLorentzVector vec;
     
    5454//------------------------------------------------------------------------------
    5555
    56 TLorentzVector MissingET::P4()
     56TLorentzVector MissingET::P4() const
    5757{
    5858  TLorentzVector vec;
     
    6363//------------------------------------------------------------------------------
    6464
    65 TLorentzVector Photon::P4()
     65TLorentzVector Photon::P4() const
    6666{
    6767  TLorentzVector vec;
     
    7272//------------------------------------------------------------------------------
    7373
    74 TLorentzVector Electron::P4()
     74TLorentzVector Electron::P4() const
    7575{
    7676  TLorentzVector vec;
     
    8181//------------------------------------------------------------------------------
    8282
    83 TLorentzVector Muon::P4()
     83TLorentzVector Muon::P4() const
    8484{
    8585  TLorentzVector vec;
     
    9090//------------------------------------------------------------------------------
    9191
    92 TLorentzVector Jet::P4()
     92TLorentzVector Jet::P4() const
    9393{
    9494  TLorentzVector vec;
     
    9999//------------------------------------------------------------------------------
    100100
    101 TLorentzVector Track::P4()
     101TLorentzVector Track::P4() const
    102102{
    103103  TLorentzVector vec;
     
    108108//------------------------------------------------------------------------------
    109109
    110 TLorentzVector Tower::P4()
     110TLorentzVector Tower::P4() const
    111111{
    112112  TLorentzVector vec;
  • classes/DelphesClasses.h

    r6ec8d18 rdd514ae  
    161161  const CompBase *GetCompare() const { return fgCompare; }
    162162
    163   TLorentzVector P4();
     163  TLorentzVector P4() const;
    164164
    165165  ClassDef(GenParticle, 1)
     
    188188  Float_t Phi; // mising energy azimuthal angle
    189189
    190   TLorentzVector P4();
     190  TLorentzVector P4() const;
    191191
    192192  ClassDef(MissingET, 1)
     
    254254  const CompBase *GetCompare() const { return fgCompare; }
    255255
    256   TLorentzVector P4();
     256  TLorentzVector P4() const;
    257257
    258258  ClassDef(Photon, 2)
     
    289289  const CompBase *GetCompare() const { return fgCompare; }
    290290
    291   TLorentzVector P4();
     291  TLorentzVector P4() const;
    292292
    293293  ClassDef(Electron, 2)
     
    322322  const CompBase *GetCompare() const { return fgCompare; }
    323323
    324   TLorentzVector P4();
     324  TLorentzVector P4() const;
    325325
    326326  ClassDef(Muon, 2)
     
    419419  const CompBase *GetCompare() const { return fgCompare; }
    420420
    421   TLorentzVector P4();
     421  TLorentzVector P4() const;
    422422
    423423  ClassDef(Track, 2)
     
    448448  const CompBase *GetCompare() const { return fgCompare; }
    449449
    450   TLorentzVector P4();
     450  TLorentzVector P4() const;
    451451
    452452  ClassDef(Tower, 1)
Note: See TracChangeset for help on using the changeset viewer.