Index: trunk/SophyaLib/Samba/localmap.h
===================================================================
--- trunk/SophyaLib/Samba/localmap.h	(revision 470)
+++ trunk/SophyaLib/Samba/localmap.h	(revision 473)
@@ -42,5 +42,5 @@
 
 LocalMap();
-LocalMap(int_4 nx, int_4 ny);
+LocalMap(int nx, int ny);
 LocalMap(const LocalMap<T>& lm);
 virtual ~LocalMap();
@@ -48,6 +48,6 @@
 // ---------- Overloading of () to access pixel number k ----
 
-inline T& operator()(int_4 k) {return(PixVal(k));}
-inline T const& operator()(int_4 k) const {return(PixVal(k));}
+inline T& operator()(int k) {return(PixVal(k));}
+inline T const& operator()(int k) const {return(PixVal(k));}
 inline T& operator()(int ix, int iy) {return PixVal(iy*nSzX_+ix);};
 inline T const& operator()(int ix, int iy) const {return PixVal(iy*nSzX_+ix);};
@@ -56,32 +56,32 @@
 
 /* return/set the number of pixels */
-virtual int_4 NbPixels() const;
-inline void setNbPixels(int_4 n) {nPix_= n;}
+virtual int NbPixels() const;
+inline void setNbPixels(int n) {nPix_= n;}
   
 /* return the value of pixel number k */
-virtual T& PixVal(int_4 k);
-virtual T const& PixVal(int_4 k) const;
+virtual T& PixVal(int k);
+virtual T const& PixVal(int k) const;
 
 /* return the index of pixel at (theta,phi) */
-virtual int_4 PixIndexSph(float theta, float phi) const;
+virtual int PixIndexSph(double theta,double phi) const;
    
 /* return the spherical coordinates of center of pixel number k */
-virtual void PixThetaPhi(int_4 k, float& theta, float& phi) const;
+virtual void PixThetaPhi(int k,double& theta,double& phi) const;
 
 /* return the Pixel Solid angle  (steradians) */
-virtual r_8 PixSolAngle(int_4 k) const; 
+virtual double PixSolAngle(int k) const; 
 
 // ---------- Specific methods ------------------------------
 
-void ReSize(int_4 nx, int_4 ny);
+void ReSize(int nx, int ny);
 
 inline virtual char* TypeOfMap() const {return "LOCAL";};
  
 /* Origin (with angle between x axis and phi axis, in degrees)  x0,y0  the default: middle of map*/
-virtual void SetOrigin(float theta=90., float phi=0., float angle=0.);
-virtual void SetOrigin(float theta,float phi,int_4 x0,int_4 y0,float angle=0.);
+virtual void SetOrigin(double theta=90.,double phi=0.,double angle=0.);
+virtual void SetOrigin(double theta,double phi,int x0,int y0,double angle=0.);
 
 /* Pixel size (degres) */ 
-virtual void SetSize(float angleX, float angleY);
+virtual void SetSize(double angleX,double angleY);
 
 /* Check to see if the local mapping is done */
@@ -95,17 +95,17 @@
   
 /* provides a integer characterizing the pixelization refinement  (here : number of pixels) */
-inline virtual int_4 SizeIndex() const {return(nPix_);}
-inline int_4 Size_x() const {return nSzX_;}
-inline void setSize_x(int_4 n) {nSzX_= n;}
-inline int_4 Size_y() const {return nSzY_;}
-inline void setSize_y(int_4 n) {nSzY_= n;}
+inline virtual int SizeIndex() const {return(nPix_);}
+inline int Size_x() const {return nSzX_;}
+inline void setSize_x(int n) {nSzX_= n;}
+inline int Size_y() const {return nSzY_;}
+inline void setSize_y(int n) {nSzY_= n;}
 
-inline void Origin(float& theta, float& phi,int& x0, int& y0, float& angle) const {theta= (float)theta0_; phi= (float)phi0_; x0= x0_; y0= y0_;angle= (float)angle_;}
+inline void Origin(double& theta,double& phi,int& x0,int& y0,double& angle) const {theta= theta0_; phi= phi0_; x0= x0_; y0= y0_;angle= angle_;}
 
-inline void Aperture(float& anglex, float& angley) const {anglex= (float)angleX_; angley= (float)angleY_;}
+inline void Aperture(double& anglex,double& angley) const {anglex= angleX_; angley= angleY_;}
 
 /* retourne le pointeur vers/remplit  le vecteur des contenus des pixels */ 
 inline const NDataBlock<T>* getDataBlock() const {return (&pixels_);}
-inline void setDataBlock(T* data, int_4 n) {pixels_.FillFrom(n,data);}
+inline void setDataBlock(T* data, int n) {pixels_.FillFrom(n,data);}
 
 /* impression */ 
@@ -117,28 +117,28 @@
 
 void InitNul();
-void Getij(int k, int& i, int& j) const;
-void ReferenceToUser(float &theta, float &phi) const; 
-void UserToReference(float &theta, float &phi) const;
-void PixProjToAngle(float x, float y,float &theta, float &phi) const; 
-void AngleProjToPix(float theta, float phi, float& x, float& y) const; 
+void Getij(int k,int& i,int& j) const;
+void ReferenceToUser(double& theta,double& phi) const; 
+void UserToReference(double& theta,double& phi) const;
+void PixProjToAngle(double x,double y,double& theta,double& phi) const; 
+void AngleProjToPix(double theta,double phi,double& x,double& y) const; 
 
 // ---------- Variables internes ----------------------------
 
-int_4 nSzX_;
-int_4 nSzY_;
-int_4 nPix_;
+int nSzX_;
+int nSzY_;
+int nPix_;
 bool originFlag_;
 bool extensFlag_;
-int_4 x0_;
-int_4 y0_;
-r_8 theta0_;
-r_8 phi0_;
-r_8 angle_;
-r_4 cos_angle_;
-r_4 sin_angle_;
-r_8 angleX_;
-r_8 angleY_;
-r_8 tgAngleX_;
-r_8 tgAngleY_;
+int x0_;
+int y0_;
+double theta0_;
+double phi0_;
+double angle_;
+double cos_angle_;
+double sin_angle_;
+double angleX_;
+double angleY_;
+double tgAngleX_;
+double tgAngleY_;
 NDataBlock<T> pixels_;
 };
