Changeset 682 in Sophya for trunk/SophyaLib/Samba/localmap.h

Timestamp:

Dec 10, 1999, 5:56:03 PM (26 years ago)

Author:

ansari

Message:

Compilation Mac pour CodeWarrior PRO 5

File:

• trunk/SophyaLib/Samba/localmap.h (modified) (10 diffs)

trunk/SophyaLib/Samba/localmap.h

@@ -65 +65 @@
 
 LocalMap();
-LocalMap(int nx, int ny);
+LocalMap(int_4 nx, int_4 ny);
 LocalMap(const LocalMap<T>& lm, bool share=false);
 virtual ~LocalMap();
@@ -71 +71 @@
 // ---------- Overloading of () to access pixel number 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);};
+inline T& operator()(int_4 k) {return(PixVal(k));}
+inline T const& operator()(int_4 k) const {return(PixVal(k));}
+inline T& operator()(int_4 ix, int_4 iy) {return PixVal(iy*nSzX_+ix);};
+inline T const& operator()(int_4 ix, int_4 iy) const {return PixVal(iy*nSzX_+ix);};
    
 // ---------- Definition of PixelMap abstract methods -------
@@ -80 +80 @@
 /* return/set the number of pixels */
 /*!    Return number of pixels */
-virtual int NbPixels() const;
-inline void setNbPixels(int n) {nPix_= n;}
+virtual int_4 NbPixels() const;
+inline void setNbPixels(int_4 n) {nPix_= n;}
   
 /* return the value of pixel number k */
 /*!    Return value of pixel with index k */
-virtual T& PixVal(int k);
+virtual T& PixVal(int_4 k);
 /*!   const version of previous method */
-virtual T const& PixVal(int k) const;
+virtual T const& PixVal(int_4 k) const;
 
 /* Return true if teta,phi in map  */
@@ -93 +93 @@
 /* return the index of pixel at (theta,phi) */
 /*!    Return index of the pixel with spherical coordinates (theta,phi) */
-virtual int PixIndexSph(double theta,double phi) const;
+virtual int_4 PixIndexSph(double theta,double phi) const;
    
 /* return the spherical coordinates of center of pixel number k */
 /*!    Return (theta, phi) coordinates of pixel with index k */
-virtual void PixThetaPhi(int k,double& theta,double& phi) const;
+virtual void PixThetaPhi(int_4 k,double& theta,double& phi) const;
 
 /*! Set all pixels to value v */
@@ -108 +108 @@
     because of the projection scheme which is not yet fixed. 
 */  
-virtual double PixSolAngle(int k) const; 
+virtual double PixSolAngle(int_4 k) const; 
 
 // ---------- Specific methods ------------------------------
 
 /*!    Resize storage area for pixels */
-void ReSize(int nx, int ny);
+void ReSize(int_4 nx, int_4 ny);
 
 inline virtual char* TypeOfMap() const {return "LOCAL";};
@@ -124 +124 @@
 virtual void SetOrigin(double theta=90.,double phi=0.,double angle=0.);
 /*!    set the referential of the map (angles in degrees) */
-virtual void SetOrigin(double theta,double phi,int x0,int y0,double angle=0.);
+virtual void SetOrigin(double theta,double phi,int_4 x0,int_4 y0,double angle=0.);
 
 /* Pixel size (degres) */ 
@@ -140 +140 @@
   
 /* provides a integer characterizing the pixelization refinement  (here : number of pixels) */
-inline virtual int SizeIndex() const {return(nPix_);}
-inline int Size_x() const {return nSzX_;}
-inline int XSize() const {return nSzX_;}
-inline void setSize_x(int n) {nSzX_= n;}
-inline int Size_y() const {return nSzY_;}
-inline int YSize() const {return nSzY_;}
-inline void setSize_y(int n) {nSzY_= n;}
-
-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 virtual int_4 SizeIndex() const {return(nPix_);}
+inline int_4 Size_x() const {return nSzX_;}
+inline int_4 XSize() const {return nSzX_;}
+inline void setSize_x(int_4 n) {nSzX_= n;}
+inline int_4 Size_y() const {return nSzY_;}
+inline int_4 YSize() const {return nSzY_;}
+inline void setSize_y(int_4 n) {nSzY_= n;}
+
+inline void Origin(double& theta,double& phi,int_4& x0,int_4& y0,double& angle) const {theta= theta0_; phi= phi0_; x0= x0_; y0= y0_;angle= angle_;}
 
 inline void Aperture(double& anglex,double& angley) const {anglex= angleX_; angley= angleY_;}
@@ -154 +154 @@
 /* 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 n) {pixels_.FillFrom(n,data);}
+inline void setDataBlock(T* data, int_4 n) {pixels_.FillFrom(n,data);}
 
 /*  Acces to the DataBlock  */
@@ -169 +169 @@
 void InitNul();
 /*!    Return 2 indices corresponding to the pixel number k */
-void Getij(int k,int& i,int& j) const;
+void Getij(int_4 k,int_4& i,int_4& j) const;
 /*!    Transform a pair of coordinates (theta, phi) given in 
     reference coordinates into map coordinates
@@ -189 +189 @@
 // ---------- Variables internes ----------------------------
 
-int nSzX_;
-int nSzY_;
-int nPix_;
+int_4 nSzX_;
+int_4 nSzY_;
+int_4 nPix_;
 bool originFlag_;
 bool extensFlag_;
-int x0_;
-int y0_;
+int_4 x0_;
+int_4 y0_;
 double theta0_;
 double phi0_;