Commit bd1daead authored by Michele Maris's avatar Michele Maris
Browse files

w bugs fixed

parent ae0833c9

src/lspe_prm/lspe_prm.py

+27 −4
Original line number Diff line number Diff line
@@ -355,12 +355,28 @@ PRM of order 0 
          the old version does not handle properly the cases zVAX=0.

      """

      if self.isAllSet :

         self._r={}

         for k in self._d.keys() :

            if not k in ['thetaSign','phiSign'] :

               self._r[k]=np.deg2rad(self._d[k])

         #

         #single angle rotation matrices

         for k in ['roll','pan','tilt','tiltFork','zVAX','omegaVAX'] :

            self._matr[k]=self.ERotZ(np.deg2rad(np.array([self._d[k]])))

         self._matr['ctheta0']=self.ERotY(-self._thetaSign*np.deg2rad(np.array([self._d['ctheta0']])))

         self._matr['cphi0']=self.ERotY(-self._thetaSign*np.deg2rad(np.array([self._d['cphi0']])))

         self._matr['roll']=self.ERotZ(self._r['roll'])

         self._matr['pan']=self.ERotY(self._r['pan'])

         self._matr['tilt']=self.ERotX(self._r['tilt'])

         #

         self._matr['ctheta0']=self.ERotY(-self._thetaSign*self._r['ctheta0'])

         #

         self._matr['tiltFork']=self.ERotX(self._r['tiltFork'])

         #

         self._matr['cphi0']=self.ERotZ(-self._phiSign*self._r['cphi0'])

         #

         self._matr['zVAX']=self.ERotX(self._r['zVAX'])

         self._matr['omegaVAX']=self.ERotZ(self._r['omegaVAX'])

         #

         #single angle rotation matrices

         #self._matr['ctheta0']=self.ERotY(-self._thetaSign*np.deg2rad(np.array([self._d['ctheta0']])))

         #self._matr['cphi0']=self.ERotY(-self._phiSign*np.deg2rad(np.array([self._d['cphi0']])))

         #self._matr['roll']=self.ERotY(np.deg2rad(np.array([this])))

         #self._matr['pan']=self.ERotY(np.deg2rad(np.array([this])))

         #self._matr['tilt']=self.ERotX(np.deg2rad(np.array([this])))
@@ -394,6 +410,13 @@ PRM of order 0 
         self._isComplete=False

         raise Error('Configuration not completed','')

   #

   def config2dict(self) :

      """convert configuration angles to dict"""

      out={}

      for k in self.keys() :

         out[k]=self._d[k]

      return out

   #

   def __call__(self,CTHETA_PHI) :

      """ 

Apply rotations for a list of NPOS control angles: (CTR_THETA, CTR_PHI)