ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/MitAna/DataTree/interface/Electron.h
(Generate patch)

Comparing UserCode/MitAna/DataTree/interface/Electron.h (file contents):
Revision 1.54 by ceballos, Sat May 12 11:37:23 2012 UTC vs.
Revision 1.55 by paus, Sat May 12 15:55:10 2012 UTC

# Line 5 | Line 5
5   //
6   // This class holds information about reconstructed electrons from CMSSW.
7   //
8 < // Authors: C.Loizides, J.Bendavid, S.Xie
8 > // Authors: C.Paus, G.Ceballos, C.Loizides, J.Bendavid, S.Xie
9   //--------------------------------------------------------------------------------------------------
10  
11   #ifndef MITANA_DATATREE_ELECTRON_H
# Line 49 | Line 49 | namespace mithep
49          fClassification(0), fIsEB(), fIsEE(0), fIsEBEEGap(0), fIsEBEtaGap(0),
50          fIsEBPhiGap(0), fIsEEDeeGap(0), fIsEERingGap(0),
51          fIsEcalDriven(0), fIsTrackerDriven(0), fMatchesVertexConversion(0),
52 + <<<<<<< Electron.h
53 +        fHadOverEmTow(0), fHCalIsoTowDr03(0), fHCalIsoTowDr04(0),
54 +        fEcalEnergy(0), fEcalEnergyError(0) {}
55 + =======
56          fHadOverEmTow(0), fHCalIsoTowDr03(0), fHCalIsoTowDr04(0),
57          fCorrectedEcalEnergy(0), fCorrectedEcalEnergyError(0) {}
58 + >>>>>>> 1.54
59  
60        const Track         *BestTrk()                     const;
61        Double_t             D0PV()                        const { return fD0PV; }
# Line 177 | Line 182 | namespace mithep
182        Bool_t               HasAmbiguousGsfTrack(const Track *t) const { return fAmbiguousGsfTracks.HasObject(t); }
183        const Track         *AmbiguousGsfTrack(UInt_t i)      const { return fAmbiguousGsfTracks.At(i); }
184        Int_t                CTFTrkNLayersWithMeasurement()   const { return fCTFTrkNLayersWithMeasurement; }
185 + <<<<<<< Electron.h
186 +      Double_t             HadOverEmTow()                   const { return fHadOverEmTow;       }
187 +      Double_t             HcalIsoTowDr03()                 const { return fHCalIsoTowDr03;    }
188 +      Double_t             HcalIsoTowDr04()                 const { return fHCalIsoTowDr04;    }
189 +      Double_t             EcalEnergy()                     const { return fEcalEnergy;      }
190 +      Double_t             EcalEnergyError()                const { return fEcalEnergyError; }
191 + =======
192        Double_t             HadOverEmTow()          const { return fHadOverEmTow;       }
193        Double_t             HcalIsoTowDr03()        const { return fHCalIsoTowDr03;    }
194        Double_t             HcalIsoTowDr04()        const { return fHCalIsoTowDr04;    }
195        Double_t             CorrectedEcalEnergy()      const { return fCorrectedEcalEnergy;      }
196        Double_t             CorrectedEcalEnergyError() const { return fCorrectedEcalEnergyError; }
197 + >>>>>>> 1.54
198  
199        void                 AddAmbiguousGsfTrack(const Track *t)          { fAmbiguousGsfTracks.Add(t); }
200        void                 SetCharge(Char_t x)                           { fCharge = x; ClearCharge(); }
# Line 293 | Line 306 | namespace mithep
306        void                 SetConversionXYZ(Double_t x, Double_t y, Double_t z)
307                                    { fConvPosition.SetXYZ(x,y,z); }
308        void                 SetCTFTrkNLayersWithMeasurement(Int_t x){ fCTFTrkNLayersWithMeasurement = x; }
309 + <<<<<<< Electron.h
310 +      void                 SetHadOverEmTow(Double_t x)             { fHadOverEmTow = x; }
311 +      void                 SetHCalIsoTowDr03(Double_t x)           { fHCalIsoTowDr03 = x; }
312 +      void                 SetHCalIsoTowDr04(Double_t x)           { fHCalIsoTowDr04 = x; }
313 +      void                 SetEcalEnergy(Double_t e)               { fEcalEnergy = e; }
314 +      void                 SetEcalEnergyError(Double_t e)          { fEcalEnergyError = e; }
315 + =======
316        void                 SetHadOverEmTow(Double_t x)             { fHadOverEmTow = x;  }
317        void                 SetHCalIsoTowDr03(Double_t x)          { fHCalIsoTowDr03 = x; }
318        void                 SetHCalIsoTowDr04(Double_t x)          { fHCalIsoTowDr04 = x; }
319        void                 SetCorrectedEcalEnergy(Double_t e)     { fCorrectedEcalEnergy= e;       }
320        void                 SetCorrectedEcalEnergyError(Double_t e){ fCorrectedEcalEnergyError = e; }
321 + >>>>>>> 1.54
322      
323        const Track         *TrackerTrk()            const { return fTrackerTrackRef.Obj(); }
324        const Track         *Trk()                   const { return BestTrk(); }
# Line 360 | Line 381 | namespace mithep
381        Double32_t           fD0PVBSErr;                 //[0,0,14]transverse impact parameter uncertainty to signal PV w/ bs constraint (gsf track)
382        Double32_t           fIp3dPVBS;                  //[0,0,14]3d impact parameter to signal PV w/ bs constraint (gsf track)
383        Double32_t           fIp3dPVBSErr;               //[0,0,14]3d impact parameter uncertainty to signal PV w/ bs constraint (gsf track)
384 <      Double32_t           fD0PVCkf;                      //[0,0,14]transverse impact parameter to signal PV (ckf track)
385 <      Double32_t           fD0PVCkfErr;                   //[0,0,14]transverse impact parameter uncertainty to signal PV (ckf track)
386 <      Double32_t           fIp3dPVCkf;                    //[0,0,14]3d impact parameter to signal PV (ckf track)
387 <      Double32_t           fIp3dPVCkfErr;                 //[0,0,14]3d impact parameter uncertainty to signal PV (ckf track)
388 <      Double32_t           fD0PVBSCkf;                    //[0,0,14]transverse impact parameter to signal PV w/ bs constraint (ckf track)
389 <      Double32_t           fD0PVBSCkfErr;                 //[0,0,14]transverse impact parameter uncertainty to signal PV w/ bs constraint (ckf track)
390 <      Double32_t           fIp3dPVBSCkf;                  //[0,0,14]3d impact parameter to signal PV w/ bs constraint (ckf track)
391 <      Double32_t           fIp3dPVBSCkfErr;               //[0,0,14]3d impact parameter uncertainty to signal PV w/ bs constraint (ckf track)
392 <      Double32_t           fD0PVUB;                      //[0,0,14]transverse impact parameter to signal PVUB (gsf track)
393 <      Double32_t           fD0PVUBErr;                   //[0,0,14]transverse impact parameter uncertainty to signal PVUB (gsf track)
394 <      Double32_t           fIp3dPVUB;                    //[0,0,14]3d impact parameter to signal PVUB (gsf track)
395 <      Double32_t           fIp3dPVUBErr;                 //[0,0,14]3d impact parameter uncertainty to signal PVUB (gsf track)
396 <      Double32_t           fD0PVUBBS;                    //[0,0,14]transverse impact parameter to signal PVUB w/ bs constraint (gsf track)
397 <      Double32_t           fD0PVUBBSErr;                 //[0,0,14]transverse impact parameter uncertainty to signal PVUB w/ bs constraint (gsf track)
398 <      Double32_t           fIp3dPVUBBS;                  //[0,0,14]3d impact parameter to signal PVUB w/ bs constraint (gsf track)
399 <      Double32_t           fIp3dPVUBBSErr;               //[0,0,14]3d impact parameter uncertainty to signal PVUB w/ bs constraint (gsf track)
400 <      Double32_t           fD0PVUBCkf;                      //[0,0,14]transverse impact parameter to signal PVUB (ckf track)
401 <      Double32_t           fD0PVUBCkfErr;                   //[0,0,14]transverse impact parameter uncertainty to signal PVUB (ckf track)
402 <      Double32_t           fIp3dPVUBCkf;                    //[0,0,14]3d impact parameter to signal PVUB (ckf track)
403 <      Double32_t           fIp3dPVUBCkfErr;                 //[0,0,14]3d impact parameter uncertainty to signal PVUB (ckf track)
404 <      Double32_t           fD0PVUBBSCkf;                    //[0,0,14]transverse impact parameter to signal PVUB w/ bs constraint (ckf track)
405 <      Double32_t           fD0PVUBBSCkfErr;                 //[0,0,14]transverse impact parameter uncertainty to signal PVUB w/ bs constraint (ckf track)
406 <      Double32_t           fIp3dPVUBBSCkf;                  //[0,0,14]3d impact parameter to signal PVUB w/ bs constraint (ckf track)
407 <      Double32_t           fIp3dPVUBBSCkfErr;               //[0,0,14]3d impact parameter uncertainty to signal PVUB w/ bs constraint (ckf track)
384 >      Double32_t           fD0PVCkf;                   //[0,0,14]transverse impact parameter to signal PV (ckf track)
385 >      Double32_t           fD0PVCkfErr;                //[0,0,14]transverse impact parameter uncertainty to signal PV (ckf track)
386 >      Double32_t           fIp3dPVCkf;                 //[0,0,14]3d impact parameter to signal PV (ckf track)
387 >      Double32_t           fIp3dPVCkfErr;              //[0,0,14]3d impact parameter uncertainty to signal PV (ckf track)
388 >      Double32_t           fD0PVBSCkf;                 //[0,0,14]transverse impact parameter to signal PV w/ bs constraint (ckf track)
389 >      Double32_t           fD0PVBSCkfErr;              //[0,0,14]transverse impact parameter uncertainty to signal PV w/ bs constraint (ckf track)
390 >      Double32_t           fIp3dPVBSCkf;               //[0,0,14]3d impact parameter to signal PV w/ bs constraint (ckf track)
391 >      Double32_t           fIp3dPVBSCkfErr;            //[0,0,14]3d impact parameter uncertainty to signal PV w/ bs constraint (ckf track)
392 >      Double32_t           fD0PVUB;                    //[0,0,14]transverse impact parameter to signal PVUB (gsf track)
393 >      Double32_t           fD0PVUBErr;                 //[0,0,14]transverse impact parameter uncertainty to signal PVUB (gsf track)
394 >      Double32_t           fIp3dPVUB;                  //[0,0,14]3d impact parameter to signal PVUB (gsf track)
395 >      Double32_t           fIp3dPVUBErr;               //[0,0,14]3d impact parameter uncertainty to signal PVUB (gsf track)
396 >      Double32_t           fD0PVUBBS;                  //[0,0,14]transverse impact parameter to signal PVUB w/ bs constraint (gsf track)
397 >      Double32_t           fD0PVUBBSErr;               //[0,0,14]transverse impact parameter uncertainty to signal PVUB w/ bs constraint (gsf track)
398 >      Double32_t           fIp3dPVUBBS;                //[0,0,14]3d impact parameter to signal PVUB w/ bs constraint (gsf track)
399 >      Double32_t           fIp3dPVUBBSErr;             //[0,0,14]3d impact parameter uncertainty to signal PVUB w/ bs constraint (gsf track)
400 >      Double32_t           fD0PVUBCkf;                 //[0,0,14]transverse impact parameter to signal PVUB (ckf track)
401 >      Double32_t           fD0PVUBCkfErr;              //[0,0,14]transverse impact parameter uncertainty to signal PVUB (ckf track)
402 >      Double32_t           fIp3dPVUBCkf;               //[0,0,14]3d impact parameter to signal PVUB (ckf track)
403 >      Double32_t           fIp3dPVUBCkfErr;            //[0,0,14]3d impact parameter uncertainty to signal PVUB (ckf track)
404 >      Double32_t           fD0PVUBBSCkf;               //[0,0,14]transverse impact parameter to signal PVUB w/ bs constraint (ckf track)
405 >      Double32_t           fD0PVUBBSCkfErr;            //[0,0,14]transverse impact parameter uncertainty to signal PVUB w/ bs constraint (ckf track)
406 >      Double32_t           fIp3dPVUBBSCkf;             //[0,0,14]3d impact parameter to signal PVUB w/ bs constraint (ckf track)
407 >      Double32_t           fIp3dPVUBBSCkfErr;          //[0,0,14]3d impact parameter uncertainty to signal PVUB w/ bs constraint (ckf track)
408        Double32_t           fGsfPVCompatibility;        //[0,0,14]gsf compatibility with signal PV
409        Double32_t           fGsfPVBSCompatibility;      //[0,0,14]gsf compatibility with signal PV w/ bs constraint
410        Double32_t           fGsfPVCompatibilityMatched; //[0,0,14]gsf compatibility with signal PV (matching ckf track excluded from vertex)
# Line 412 | Line 433 | namespace mithep
433        RefArray<Track>      fAmbiguousGsfTracks;        //ambiguous gsf tracks for this electron
434        Double_t             fEEleClusterOverPout;       //energy of the electron cluster
435        Int_t                fCTFTrkNLayersWithMeasurement; //number of tracker layers from associated ctf trk
436 <      Double32_t           fHadOverEmTow;       //[0,0,14]per-tower definition of hadronic/em energy fraction
437 <      Double32_t           fHCalIsoTowDr03;     //[0,0,14]hcal isolation matched to per tower h/e definition
438 <      Double32_t           fHCalIsoTowDr04;     //[0,0,14]hcal isolation matched to per tower h/e definition
439 <      Double32_t           fCorrectedEcalEnergy;      //[0,0,14]corrected Ecal energy
440 <      Double32_t           fCorrectedEcalEnergyError; //[0,0,14]corrected Ecal energy error
441 <      Ref<SuperCluster>    fPFSuperClusterRef;  //reference to Particle Flow SuperCluster
436 >      Double32_t           fHadOverEmTow;              //[0,0,14]per-tower definition of hadronic/em energy fraction
437 >      Double32_t           fHCalIsoTowDr03;            //[0,0,14]hcal isolation matched to per tower h/e definition
438 >      Double32_t           fHCalIsoTowDr04;            //[0,0,14]hcal isolation matched to per tower h/e definition
439 >      Double32_t           fEcalEnergy;                //[0,0,14]corrected Ecal energy
440 >      Double32_t           fEcalEnergyError;           //[0,0,14]corrected Ecal energy error
441 >      Ref<SuperCluster>    fPFSuperClusterRef;         //reference to Particle Flow SuperCluster
442  
443 <    ClassDef(Electron, 15) // Electron class
443 >    ClassDef(Electron, 15)                             // Electron class
444    };
445   }
446  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines