Changeset 1758 in Sophya

Timestamp:

Nov 13, 2001, 4:37:58 PM (24 years ago)

Author:

lemeur

Message:

nouveau circle, pour ELDESTINO

Location:

trunk/SophyaLib/Samba

Files:

• circle.cc (modified) (5 diffs)
• circle.h (modified) (2 diffs)

trunk/SophyaLib/Samba/circle.cc

@@ -54 +54 @@
 //--
 {
-  UnitVector temp=c.Omega();
+  UnitVector temp= c.Omega();
   SetCircle(temp,c._angouv);
 }
@@ -65 +65 @@
 //--
 {
-  _spinunitaxis=temp;
-  _angouv=aperture;
-  _spinaxis=_spinunitaxis*fabs(cos(_angouv));
-  _theta=_spinunitaxis.Theta();
-  _phi=_spinunitaxis.Phi();
-  _x=_spinunitaxis.X();
-  _y=_spinunitaxis.Y();
-  _z=_spinunitaxis.Z();
+  _spinunitaxis= temp;
+
+  _angouv = aperture;
+  _cangouv= cos(_angouv);
+  _sangouv= sin(_angouv);
+
+  _spinaxis=_spinunitaxis*fabs(_cangouv);
+
+  _theta =_spinunitaxis.Theta();
+  _ctheta= cos(_theta);
+  _stheta= sin(_theta);
+
+  _phi =_spinunitaxis.Phi();
+  _cphi= cos(_phi);
+  _sphi= sin(_phi);
+
+  _x= _spinunitaxis.X();
+  _y= _spinunitaxis.Y();
+  _z= _spinunitaxis.Z();
 }
 //++
@@ -112 +123 @@
   SetCircle(_spinunitaxis,c._angouv);
 }
+
 //++
 bool Circle::Intersection(const Circle& c, double* psi) const 
@@ -128 +140 @@
   Vector3d ol=c._spinaxis;
   double gamma=ok.SepAngle(ol);
+
   if( fabs(alphak-alphal) < gamma && gamma <= (alphak+alphal) && this != &c ) 
     { 
@@ -291 +304 @@
   return (bool)(1-(this->operator==(c)));
 }
+//
+bool Circle::intersection(const Circle* c) const
+{
+  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) {
+    return true;
+  } else {
+    return false;
+  }
+}
+//
+bool Circle::intersection(const Circle& c, double* psi) const
+{
+  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) {
+
+    double sgamma= sin(gamma); 
+    double cgamma= cos(gamma);
+
+    double sdphi= _sphi*c._cphi - _cphi*c._sphi; 
+    double cdphi= _cphi*c._cphi + _sphi*c._sphi;
+
+    double ssk= c._stheta*sdphi/sgamma;
+    double csk= (c._ctheta*_stheta-c._stheta*_ctheta*cdphi)/sgamma;
+
+    double ssl= -_stheta*sdphi/sgamma;
+    double csl= (_ctheta*c._stheta-_stheta*c._ctheta*cdphi)/sgamma;
+
+    double ak= atan2(ssk,csk);
+    double al= atan2(ssl,csl);
+    double omegak= acos((c._cangouv-_cangouv*cgamma)/sgamma/_sangouv);
+    double omegal= acos((_cangouv-c._cangouv*cgamma)/sgamma/c._sangouv);
+
+    psi[0]= fmod(ak-omegak+pi2,pi2);
+    psi[1]= fmod(ak+omegak+pi2,pi2);
+    psi[2]= fmod(al-omegal+pi2,pi2);
+    psi[3]= fmod(al+omegal+pi2,pi2);
+
+    if(psi[0] > psi[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;
+  }
+}

trunk/SophyaLib/Samba/circle.h

@@ -44 +44 @@
   */
   bool Intersection(const Circle&, double* psi) const;
+  bool intersection(const Circle&, double*) const;
+  bool intersection(const Circle*) const;
 
   // donne le UnitVector correspondant a une position donnee sur le cercle
@@ -90 +92 @@
   double _x,_y,_z;
 
+  double _cangouv;
+  double _sangouv;
+  double _ctheta;
+  double _stheta;
+  double _cphi;
+  double _sphi;
 };