Changeset 1825 in Sophya

Timestamp:

Dec 19, 2001, 3:33:12 PM (24 years ago)

Author:

ansari

Message:

Suite modifs datacircleX.* ... par Touze Reza 19/12/2001

Location:

trunk/SophyaLib/Samba

Files:

• datacirclebase.h (modified) (2 diffs)
• datacirclefake.cc (modified) (2 diffs)
• datacirclefake.h (modified) (1 diff)

trunk/SophyaLib/Samba/datacirclebase.h

@@ -3 +3 @@
 
 #include "circle.h"
+
+static long l_ft_nint(double x) {
+  return ( (x < 0.) ? (long)(x-0.5) : (long)(x+0.5) ) ;
+}
 
 class DataCircleBase : public Circle {
@@ -15 +19 @@
   virtual int NMeasurements() const = 0;
   virtual double getData(double) const = 0;
+  virtual double getTMeasure(double) const = 0;
+
   virtual void print(ostream&) const= 0;
 

trunk/SophyaLib/Samba/datacirclefake.cc

@@ -21 +21 @@
 double DataCircleFake::getData(double psi) const {
 
-  int ibin= (int)floor(psi*_NMeasurements/2./M_PI);
+  int ibin= l_ft_nint(psi*_NMeasurements/(2.*M_PI));
   //cout << "bin= " << ibin << ", " << _mesures[ibin] << endl;
   return _mesures[ibin];
@@ -37 +37 @@
       << NMeasurements() << endl;
 }
+
+double DataCircleFake::getTMeasure(double psi) const {
+
+  if(_mesures == NULL) {
+    cout << "  DataCircleFake::getTMeasure data must be stored"
+         << " in an array... " << endl;
+    exit(0);
+  }
+  int ibin= l_ft_nint(psi*_NMeasurements/(2.*M_PI));
+  return _mesures[ibin];
+}

trunk/SophyaLib/Samba/datacirclefake.h

@@ -14 +14 @@
   virtual int NMeasurements() const;
   virtual double getData(double) const;
+  virtual double getTMeasure(double) const;
   virtual void print(ostream&) const;