TrackRnrStyle: add pt-range memebers.

diff --git a/EVE/Reve/Track.cxx b/EVE/Reve/Track.cxx
index c9a192fe3d6e49563b0e7f2bc6d2a04fcab92c51..1adcf83216d63c86050cf70cb832458c210cd467 100644 (file)
--- a/EVE/Reve/Track.cxx
+++ b/EVE/Reve/Track.cxx
@@ -342,6 +342,9 @@ TrackRnrStyle::TrackRnrStyle() :
   fMinAng  (45),
   fDelta   (0.1),
 
   fMinAng  (45),
   fDelta   (0.1),
 

+  fMinPt   (0.1),
+  fMaxPt   (10),
+

   fFitDaughters  (kTRUE),
   fFitReferences (kTRUE),
   fFitDecay      (kTRUE),
   fFitDaughters  (kTRUE),
   fFitReferences (kTRUE),
   fFitDecay      (kTRUE),


@@ -553,6 +556,9 @@ void TrackList::SetRnrTracks(Bool_t rnr)
 
 void TrackList::SelectByPt(Float_t min_pt, Float_t max_pt)
 {
 
 void TrackList::SelectByPt(Float_t min_pt, Float_t max_pt)
 {

+  fRnrStyle->fMinPt = min_pt;
+  fRnrStyle->fMaxPt = max_pt;
+

   Float_t minptsq = min_pt*min_pt;
   Float_t maxptsq = max_pt*max_pt;
   Float_t ptsq;
   Float_t minptsq = min_pt*min_pt;
   Float_t maxptsq = max_pt*max_pt;
   Float_t ptsq;

diff --git a/EVE/Reve/Track.h b/EVE/Reve/Track.h
index 26b54e6d9d421b5f96fc42383421cf0d673a391c..40c82cad7a320a7f7c9518256975f2209bb466d0 100644 (file)
--- a/EVE/Reve/Track.h
+++ b/EVE/Reve/Track.h
@@ -105,6 +105,9 @@ public:
   Float_t                  fMinAng;  // Minimal angular step between two helix points.
   Float_t                  fDelta;   // Maximal error at the mid-point of the line connecting to helix points.
 
   Float_t                  fMinAng;  // Minimal angular step between two helix points.
   Float_t                  fDelta;   // Maximal error at the mid-point of the line connecting to helix points.
 

+  Float_t                  fMinPt;
+  Float_t                  fMaxPt;
+

   Color_t                  fPMColor;
   Style_t                  fPMStyle;
   Size_t                   fPMSize;
   Color_t                  fPMColor;
   Style_t                  fPMStyle;
   Size_t                   fPMSize;


@@ -183,9 +186,9 @@ public:
   Bool_t GetRnrTracks() const { return fRnrTracks; }
   void   SetRnrTracks(Bool_t);
 
   Bool_t GetRnrTracks() const { return fRnrTracks; }
   void   SetRnrTracks(Bool_t);
 

-  Bool_t GetRnrDaughters() const { return fRnrStyle->fRnrDaughters; }
+  Bool_t GetRnrDaughters()  const { return fRnrStyle->fRnrDaughters; }

   Bool_t GetRnrReferences() const { return fRnrStyle->fRnrReferences; }
   Bool_t GetRnrReferences() const { return fRnrStyle->fRnrReferences; }

-  Bool_t GetRnrDecay() const { return fRnrStyle->fRnrDecay; }
+  Bool_t GetRnrDecay()      const { return fRnrStyle->fRnrDecay; }

 
   void   SetRnrDaughters(Bool_t x);
   void   SetRnrReferences(Bool_t x);
 
   void   SetRnrDaughters(Bool_t x);
   void   SetRnrReferences(Bool_t x);


@@ -205,6 +208,9 @@ public:
   Float_t GetMaxOrbs()      const { return fRnrStyle->fMaxOrbs; }
   Float_t GetMinAng()       const { return fRnrStyle->fMinAng; }
   Float_t GetDelta()        const { return fRnrStyle->fDelta; }
   Float_t GetMaxOrbs()      const { return fRnrStyle->fMaxOrbs; }
   Float_t GetMinAng()       const { return fRnrStyle->fMinAng; }
   Float_t GetDelta()        const { return fRnrStyle->fDelta; }

+  
+  Float_t GetMinPt()        const { return fRnrStyle->fMinPt; }
+  Float_t GetMaxPt()        const { return fRnrStyle->fMaxPt; }

 
   Bool_t  GetFitDaughters()  const { return fRnrStyle->fFitDaughters; }
   Bool_t  GetFitReferences() const { return fRnrStyle->fFitReferences; }
 
   Bool_t  GetFitDaughters()  const { return fRnrStyle->fFitDaughters; }
   Bool_t  GetFitReferences() const { return fRnrStyle->fFitReferences; }

diff --git a/EVE/Reve/TrackEditors.cxx b/EVE/Reve/TrackEditors.cxx
index 769278ccaac0deec9a7d21373c7647e2ff1d79f5..b1d529778bf71992ebae14255c0db9d8b9d45d4f 100644 (file)
--- a/EVE/Reve/TrackEditors.cxx
+++ b/EVE/Reve/TrackEditors.cxx
@@ -26,31 +26,31 @@ using namespace Reve;
 
 ClassImp(TrackListEditor)
 
 
 ClassImp(TrackListEditor)
 

-  TrackListEditor::TrackListEditor(const TGWindow *p,
-                                  Int_t width, Int_t height,
-                                  UInt_t options, Pixel_t back) :
-    TGedFrame(p, width, height, options | kVerticalFrame, back),
-
-    fTC (0),
-
-    fMaxR(0),
-    fMaxZ(0),
-    fMaxOrbits(0),
-    fMinAng(0),
-    fDelta(0),
-
-    fRnrTracks(0),
-    fRnrMarkers(0),
-
-    fPMFrame(0),
-    fFitDaughters(0),
-    fFitReferences(0),
-    fFitDecay(0),
-    fRnrDaughters(0),
-    fRnrReferences(0),
-    fRnrDecay(0),
-
-    fPtRange(0)
+TrackListEditor::TrackListEditor(const TGWindow *p,
+                                Int_t width, Int_t height,
+                                UInt_t options, Pixel_t back) :
+  TGedFrame(p, width, height, options | kVerticalFrame, back),
+
+  fTC (0),
+
+  fMaxR(0),
+  fMaxZ(0),
+  fMaxOrbits(0),
+  fMinAng(0),
+  fDelta(0),
+
+  fRnrTracks(0),
+  fRnrMarkers(0),
+
+  fPMFrame(0),
+  fFitDaughters(0),
+  fFitReferences(0),
+  fFitDecay(0),
+  fRnrDaughters(0),
+  fRnrReferences(0),
+  fRnrDecay(0),
+
+  fPtRange(0)

 {
   MakeTitle("TrackList");
   Int_t labelW = 67;
 {
   MakeTitle("TrackList");
   Int_t labelW = 67;


@@ -123,7 +123,7 @@ ClassImp(TrackListEditor)
   fPtRange->SetNELength(6);
   fPtRange->Build();
   fPtRange->GetSlider()->SetWidth(224);
   fPtRange->SetNELength(6);
   fPtRange->Build();
   fPtRange->GetSlider()->SetWidth(224);

-  fPtRange->SetLimits(0.1, 10, TGNumberFormat::kNESRealTwo);
+  fPtRange->SetLimits(0, 10, TGNumberFormat::kNESRealTwo);

   fPtRange->Connect("ValueSet()",
                    "Reve::TrackListEditor", this, "DoPtRange()");
   AddFrame(fPtRange, new TGLayoutHints(kLHintsTop, 1, 1, 4, 1));
   fPtRange->Connect("ValueSet()",
                    "Reve::TrackListEditor", this, "DoPtRange()");
   AddFrame(fPtRange, new TGLayoutHints(kLHintsTop, 1, 1, 4, 1));


@@ -234,7 +234,7 @@ void TrackListEditor::SetModel(TObject* obj)
     ShowFrame(fRnrMarkers);
     fRnrMarkers->SetState(fTC->GetRnrMarkers() ? kButtonDown : kButtonUp);
   }
     ShowFrame(fRnrMarkers);
     fRnrMarkers->SetState(fTC->GetRnrMarkers() ? kButtonDown : kButtonUp);
   }

-  fPtRange->SetValues(0.1, 10);
+  fPtRange->SetValues(fTC->GetMinPt(), fTC->GetMaxPt());

 }
 
 /**************************************************************************/
 }
 
 /**************************************************************************/