ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/MitAna/DataTree/interface/Electron.h

Comparing UserCode/MitAna/DataTree/interface/Electron.h (file contents):
Revision 1.56 by paus, Sat May 12 16:06:05 2012 UTC vs.
Revision 1.57 by paus, Sat May 12 16:12:43 2012 UTC

#	Line 177 | Line 177 | namespace mithep
177		Bool_t               HasAmbiguousGsfTrack(const Track *t) const { return fAmbiguousGsfTracks.HasObject(t); }
178		const Track         *AmbiguousGsfTrack(UInt_t i)      const { return fAmbiguousGsfTracks.At(i); }
179		Int_t                CTFTrkNLayersWithMeasurement()   const { return fCTFTrkNLayersWithMeasurement; }
180	–	<<<<<<< Electron.h
180		Double_t             HadOverEmTow()                   const { return fHadOverEmTow;       }
181		Double_t             HcalIsoTowDr03()                 const { return fHCalIsoTowDr03;    }
182		Double_t             HcalIsoTowDr04()                 const { return fHCalIsoTowDr04;    }
183		Double_t             EcalEnergy()                     const { return fEcalEnergy;      }
184		Double_t             EcalEnergyError()                const { return fEcalEnergyError; }
186	–	=======
187	–	Double_t             HadOverEmTow()          const { return fHadOverEmTow;       }
188	–	Double_t             HcalIsoTowDr03()        const { return fHCalIsoTowDr03;    }
189	–	Double_t             HcalIsoTowDr04()        const { return fHCalIsoTowDr04;    }
190	–	Double_t             CorrectedEcalEnergy()      const { return fCorrectedEcalEnergy;      }
191	–	Double_t             CorrectedEcalEnergyError() const { return fCorrectedEcalEnergyError; }
192	–	>>>>>>> 1.54
185
186		void                 AddAmbiguousGsfTrack(const Track *t)          { fAmbiguousGsfTracks.Add(t); }
187		void                 SetCharge(Char_t x)                           { fCharge = x; ClearCharge(); }

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines