Changeset 18619 for trunk/FACT++/drive

Timestamp:

09/18/16 14:44:24 (8 years ago)

Author:

tbretz

Message:

Removed references to root.

Location:

trunk/FACT++/drive

Files:

• Led.cc (modified) (1 diff)
• Led.h (modified) (2 diffs)

trunk/FACT++/drive/Led.cc

@@ -1 +1 @@
 #include "Led.h"
 
-#include <iostream>
-
-#include <TROOT.h>
-#include <TMath.h>
+#include <math.h>
 
 #include "Ring.h"
-#include "MString.h"
-
-ClassImp(Led);
 
 using namespace std;
 
-void Led::CalcPhi(const Ring &ring)
+double Led::CalcPhi(const Ring &ring)
 {
-    fPhi = TMath::ATan2(fY-ring.GetY(), fX-ring.GetX())*180/TMath::Pi();
+    return atan2(fY-ring.GetY(), fX-ring.GetX())*180/M_PI;
 }
 
+/*
 void Led::Print(Option_t *o) const
 {
     cout << "Led: ";
-    cout << "x="   << MString::Format("%5.1f", fX)   << "+-" << fDx   << ", ";
-    cout << "y="   << MString::Format("%5.1f", fY)   << "+-" << fDy   << ", ";
-    cout << "phi=" << MString::Format("%6.1f", fPhi) << "+-" << fDphi << ", ";
+    //cout << "x="   << MString::Format("%5.1f", fX)   << "+-" << fDx   << ", ";
+    //cout << "y="   << MString::Format("%5.1f", fY)   << "+-" << fDy   << ", ";
+    //cout << "phi=" << MString::Format("%6.1f", fPhi) << "+-" << fDphi << ", ";
     cout << "mag=" << fMag << endl;
 }
+*/

trunk/FACT++/drive/Led.h

@@ -2 +2 @@
 #define COSY_Led
 
-#ifndef ROOT_TObject
-#include <TObject.h>
-#endif
+#include <stdint.h>
 
 class Ring;
 
-class Led : public TObject
+class Led
 {
 private:
-    Double_t fX;
-    Double_t fY;
-    Double_t fPhi;
+    double fX;
+    double fY;
+    double fPhi;
 
-    Double_t fDx;
-    Double_t fDy;
-    Double_t fDphi;
-
-    Double_t fMag;
+    double fMag;
 
 public:
-    Led(Double_t x=0, Double_t y=0, Double_t dx=0, Double_t dy=0, Double_t mag=0) :
-        fX(x), fY(y), fPhi(0), fDx(dx), fDy(dy), fDphi(-1), fMag(mag)
+    Led(double x=0, double y=0, double phi=0, double mag=0) :
+        fX(x), fY(y), fPhi(phi), fMag(mag)
     {
     }
 
-    Int_t Compare(const TObject *obj) const
+        /*
+    int32_t Compare(const TObject *obj) const
     {
         const Led *const l = (Led*)obj;
@@ -38 +33 @@
 
         return 0;
-    }
+    }*/
 
-    void SetX(Double_t x)     { fX=x; }
-    void SetY(Double_t y)     { fY=y; }
+    void SetX(double x)     { fX=x; }
+    void SetY(double y)     { fY=y; }
+    void SetPhi(double phi) { fPhi=phi; }
 
-    Double_t GetX() const    { return fX; }
-    Double_t GetY() const    { return fY; }
-    Double_t GetDx() const   { return fDx; }
-    Double_t GetDy() const   { return fDy; }
-    Double_t GetPhi() const  { return fPhi; }
-    Double_t GetDphi() const { return fDphi; }
-    Double_t GetMag() const  { return fMag; }
+    double GetX() const    { return fX; }
+    double GetY() const    { return fY; }
+    double GetPhi() const  { return fPhi; }
+    double GetMag() const  { return fMag; }
 
-    void AddOffset(Double_t dx, Double_t dy) { fX+=dx; fY+=dy; }
+    void AddOffset(double dx, double dy) { fX+=dx; fY+=dy; }
 
-    Bool_t IsSortable() const { return kTRUE; }
+    //bool IsSortable() const { return kTRUE; }
 
-    void CalcPhi(const Ring &ring);
+    double CalcPhi(const Ring &ring);
 
-    void Print(Option_t *o=NULL) const;
-
-    ClassDef(Led, 1)
+    //void Print(Option_t *o=NULL) const;
 };