Changeset 1770 in Sophya

Timestamp:

Nov 16, 2001, 10:12:04 AM (24 years ago)

Author:

lemeur

Message:

mises a jour pour ELDESTINO

Location:

trunk

Files:

• SophyaExt/FitsIOServer/datacirclefits.cc (added)
• SophyaExt/FitsIOServer/datacirclefits.h (added)
• SophyaLib/Samba/circle.cc (modified) (3 diffs)
• SophyaLib/Samba/circle.h (modified) (1 diff)
• SophyaLib/Samba/datacirclebase.h (added)
• SophyaLib/Samba/datacirclefake.cc (added)
• SophyaLib/Samba/datacirclefake.h (added)

trunk/SophyaLib/Samba/circle.cc

@@ -124 +124 @@
 }
 
-//++
-bool Circle::Intersection(const Circle& c, double* psi) const 
-//
-//    psi contains  4 values of the intersection  angles. 
-//    -1 if  circles do not intersect
-//    psi[0]=psi(i,j,0)
-//    psi[1]=psi(i,j,1)
-//    psi[2]=psi(j,i,0)
-//    psi[3]=psi(j,i,1)
-//--
-{
-  double alphak=_angouv;
-  double alphal=c._angouv;
-  Vector3d ok=_spinaxis;
-  Vector3d ol=c._spinaxis;
-  double gamma=ok.SepAngle(ol);
-
-  if( fabs(alphak-alphal) < gamma && gamma <= (alphak+alphal) && this != &c ) 
-    { 
-      // then the 2 circles intersect
-      double sg=sin(gamma),cg=cos(gamma);
-      double sak=sin(alphak),cak=cos(alphak);
-      double sal=sin(alphal),cal=cos(alphal);
-      double st=sin(_theta),ct=cos(_theta);
-      double stc=sin(c._theta),ctc=cos(c._theta);
-      double dphi=_phi-c._phi;
-      double sdphi=sin(dphi),cdphi=cos(dphi);
-      double sinusk=stc*sdphi/sg,cosinusk=(ctc*st-stc*ct*cdphi)/sg;
-      double sinusl=-st*sdphi/sg,cosinusl=(ct*stc-st*ctc*cdphi)/sg;
-      double gammaik=scangle(sinusk,cosinusk);
-      double gammail=scangle(sinusl,cosinusl);
-      double omegak=acos((cal-cak*cg)/sg/sak);
-      double omegal=acos((cak-cal*cg)/sg/sal);
-      psi[0]=fmod(gammaik-omegak+pi2,pi2);
-      psi[1]=fmod(gammaik+omegak+pi2,pi2);
-      psi[2]=fmod(gammail-omegal+pi2,pi2);
-      psi[3]=fmod(gammail+omegal+pi2,pi2);
-      if( psi[0] > psi[1] ) 
-        {
-          // psi[0]=psi(i,j,0)
-          // psi[1]=psi(i,j,1)
-          // psi[2]=psi(j,i,0)
-          // psi[3]=psi(j,i,1)
-          swap(psi[0],psi[1]); 
-          swap(psi[2],psi[3]); 
-        }                      
-      return true;
-    }
-  else 
-    {
-      psi[0] = -1.;
-      psi[1] = -1.;
-      psi[2] = -1.;
-      psi[3] = -1.;
-      return false;
-    }
-}
 //++
 UnitVector Circle::ConvToSphere(double psi) const 
@@ -305 +248 @@
 }
 //
-bool Circle::intersection(const Circle* c) const
+bool Circle::Intersection(const Circle& c) const
 {
   double alphak= _angouv;
-  double alphal= c->_angouv;
+  double alphal= c._angouv;
   Vector3d ok= _spinaxis;
-  Vector3d ol= c->_spinaxis;
+  Vector3d ol= c._spinaxis;
   double gamma= ok.SepAngle(ol);
 
-  if(fabs(alphak-alphal) < gamma && gamma <= (alphak+alphal) && this != c) {
+  if(fabs(alphak-alphal) < gamma && gamma <= (alphak+alphal) && this != &c) {
     return true;
   } else {
@@ -320 +263 @@
 }
 //
-bool Circle::intersection(const Circle& c, double* psi) const
+bool Circle::Intersection(const Circle& c, double* psi) const
 {
   double alphak= _angouv;

trunk/SophyaLib/Samba/circle.h

@@ -43 +43 @@
     psi[3]=psi(j,i,1)
   */
-  bool Intersection(const Circle&, double* psi) const;
-  bool intersection(const Circle&, double*) const;
-  bool intersection(const Circle*) const;
+
+  bool Intersection(const Circle&, double*) const;
+  bool Intersection(const Circle&) const;
 
   // donne le UnitVector correspondant a une position donnee sur le cercle