Changeset 854 in Sophya for trunk/SophyaExt

Timestamp:

Apr 10, 2000, 3:02:18 PM (25 years ago)

Author:

ansari

Message:

Adaptation s SphereHEALPix et deplacement SkyMap/fitsspherehealpix ici

Reza 10/4/2000

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsioserver.cc (modified) (17 diffs)
• fitsioserver.h (modified) (3 diffs)
• fitsspherehealpix.cc (added)
• fitsspherehealpix.h (added)

trunk/SophyaExt/FitsIOServer/fitsioserver.cc

@@ -80 +80 @@
           if(DTYPE == TDOUBLE)
             {
-              SphereHealpix<double> *sph= new SphereHealpix<double>(nside);
+              SphereHEALPix<double> *sph= new SphereHEALPix<double>(nside);
               load(*sph,flnm,hdunum);
               return sph;
@@ -87 +87 @@
           else if(DTYPE == TFLOAT)
             {
-              SphereHealpix<float> *sph= new SphereHealpix<float>(nside);
+              SphereHEALPix<float> *sph= new SphereHEALPix<float>(nside);
               load(*sph,flnm,hdunum);
               return sph;
@@ -501 +501 @@
         { 
           sph.Resize(nside);
-          cout << "FitsIoServer::load(SphereHealpix<double> ...) ReSizing to NSide= " << nside  << endl;
+          cout << "FitsIoServer::load(SphereHEALPix<double> ...) ReSizing to NSide= " << nside  << endl;
         }
       //      else
@@ -513 +513 @@
 
 
-void FitsIoServer::load(SphereHealpix<float>& sph,char flnm[],int nth) 
+void FitsIoServer::load(SphereHEALPix<float>& sph,char flnm[],int nth) 
 {
   int npixels= 0;
@@ -537 +537 @@
         {
           cout<<" FITSIOSERVER: no resolution parameter on fits file "<<endl;
-          throw IOExc("FitsIoServer::load(SphereHealpix<float>& ," + (string)flnm + ", ) Error No resolution parameter !");
+          throw IOExc("FitsIoServer::load(SphereHEALPix<float>& ," + (string)flnm + ", ) Error No resolution parameter !");
         }
       if (nside != sph.SizeIndex())
         { 
           sph.Resize(nside);
-          cout << " FitsIoServer::load(SphereHealpix<float> ...)";
+          cout << " FitsIoServer::load(SphereHEALPix<float> ...)";
           cout << "  ReSizing to NSide= " << nside << endl;
         }
@@ -550 +550 @@
 }
 
-void FitsIoServer::load(SphereHealpix<double>& sph,char flnm[],int nth) 
+void FitsIoServer::load(SphereHEALPix<double>& sph,char flnm[],int nth) 
 {
   int npixels= 0;
@@ -570 +570 @@
     {
       if(nside <= 0) 
-        throw IOExc("FitsIoServer::load(SphereHealpix<double>& ," + (string)flnm + ", )  No resol parameter !");
+        throw IOExc("FitsIoServer::load(SphereHEALPix<double>& ," + (string)flnm + ", )  No resol parameter !");
 
       if(nside != sph.SizeIndex())
         { 
           sph.Resize(nside);
-          cout << " FitsIoServer::load(SphereHealpix<double> ...)";
+          cout << " FitsIoServer::load(SphereHEALPix<double> ...)";
           cout << "  ReSizing to NSide= " << nside << endl;
         }
@@ -584 +584 @@
 }
 
-void FitsIoServer::load(SphereHealpix<double>& sph1,SphereHealpix<double>& sph2,SphereHealpix<double>& sph3, char flnm[]) 
+void FitsIoServer::load(SphereHEALPix<double>& sph1,SphereHEALPix<double>& sph2,SphereHEALPix<double>& sph3, char flnm[]) 
 {
   int npixels= 0;
@@ -604 +604 @@
     {
       if(nside <= 0) 
-        throw IOExc("FitsIoServer::load(SphereHealpix<double>& ," + (string)flnm + ", )  No resol parameter !");
+        throw IOExc("FitsIoServer::load(SphereHEALPix<double>& ," + (string)flnm + ", )  No resol parameter !");
 
       if(nside != sph1.SizeIndex() || nside != sph2.SizeIndex() || nside != sph3.SizeIndex())
@@ -611 +611 @@
           sph2.Resize(nside);
           sph3.Resize(nside);
-          cout << " FitsIoServer::load(SphereHealpix<double> ...)";
+          cout << " FitsIoServer::load(SphereHEALPix<double> ...)";
           cout << "  ReSizing to NSide= " << nside << endl;
         }
@@ -621 +621 @@
 }
 
-void FitsIoServer::load(SphereHealpix<float>& sph1,SphereHealpix<float>& sph2,SphereHealpix<float>& sph3, char flnm[]) 
+void FitsIoServer::load(SphereHEALPix<float>& sph1,SphereHEALPix<float>& sph2,SphereHEALPix<float>& sph3, char flnm[]) 
 {
   int npixels= 0;
@@ -645 +645 @@
         {
           cout<<" FITSIOSERVER: no resolution parameter on fits file "<<endl;
-          throw IOExc("FitsIoServer::load(SphereHealpix<float>& ," + (string)flnm + ", ) Error No resolution parameter !");
+          throw IOExc("FitsIoServer::load(SphereHEALPix<float>& ," + (string)flnm + ", ) Error No resolution parameter !");
         }
       if(nside != sph1.SizeIndex() || nside != sph2.SizeIndex() || nside != sph3.SizeIndex())
@@ -652 +652 @@
           sph2.Resize(nside);
           sph3.Resize(nside);
-          cout << " FitsIoServer::load(SphereHealpix<float> ...)";
+          cout << " FitsIoServer::load(SphereHEALPix<float> ...)";
           cout << "  ReSizing to NSide= " << nside << endl;
         }
@@ -1064 +1064 @@
 
 }
-void FitsIoServer::save(SphereHealpix<float>& sph, char filename[], int nth)   
+void FitsIoServer::save(SphereHEALPix<float>& sph, char filename[], int nth)   
 {
   int npixels = sph.NbPixels();
@@ -1086 +1086 @@
 
 }
-void FitsIoServer::save(SphereHealpix<double>& sph, char filename[], int nth)   
+void FitsIoServer::save(SphereHEALPix<double>& sph, char filename[], int nth)   
 {
   int npixels = sph.NbPixels();
@@ -1108 +1108 @@
 
 }
-void FitsIoServer::save(SphereHealpix<double>& sph1,SphereHealpix<double>& sph2,SphereHealpix<double>& sph3, char filename[])   
+void FitsIoServer::save(SphereHEALPix<double>& sph1,SphereHEALPix<double>& sph2,SphereHEALPix<double>& sph3, char filename[])   
 {
   int npixels = sph1.NbPixels();
@@ -1140 +1140 @@
 }
 
-void FitsIoServer::save(SphereHealpix<float>& sph1,SphereHealpix<float>& sph2,SphereHealpix<float>& sph3, char filename[])   
+void FitsIoServer::save(SphereHEALPix<float>& sph1,SphereHEALPix<float>& sph2,SphereHEALPix<float>& sph3, char filename[])   
 {
   int npixels = sph1.NbPixels();

trunk/SophyaExt/FitsIOServer/fitsioserver.h

@@ -3 +3 @@
 
 #include "machdefs.h" 
-#include "tvector.h"
-#include "sphericalmap.h"
-#include "spherehealpix.h"
-#include "localmap.h"
+#include "array.h"
+#include "skymap.h"
 #include "ntuple.h"
-//#include "outilsinit.h"
 #include "cimage.h"
-#include "dvlist.h"
-#include "anydataobj.h"
 #include "FitsIO/fitsio.h"    
 
@@ -39 +34 @@
  void load(ImageR4& DpcImg,char flnm[]);
  void load(ImageI4& DpcImg,char flnm[]);
- void load(SphereHealpix<float>& sph, char flnm[], int nth=1); 
- void load(SphereHealpix<double>& sph, char flnm[], int nth=1); 
- void load(SphereHealpix<double>& sph1,SphereHealpix<double>& sph2,SphereHealpix<double>& sph3, char filename[]); 
- void load(SphereHealpix<float>& sph1,SphereHealpix<float>& sph2,SphereHealpix<float>& sph3, char filename[]); 
+ void load(SphereHEALPix<float>& sph, char flnm[], int nth=1); 
+ void load(SphereHEALPix<double>& sph, char flnm[], int nth=1); 
+ void load(SphereHEALPix<double>& sph1,SphereHEALPix<double>& sph2,SphereHEALPix<double>& sph3, char filename[]); 
+ void load(SphereHEALPix<float>& sph1,SphereHEALPix<float>& sph2,SphereHEALPix<float>& sph3, char filename[]); 
  void save(TMatrix<double>& mat, char flnm[]);
  void save(TMatrix<float>& mat, char flnm[]);
@@ -54 +49 @@
  // so veut sauver par exemple 3 spheres, on appelle 3 fois save
  // avec respectivement nth=1, 2, 3  
- void save(SphereHealpix<float>& sph, char filename[], int nth=1); 
- void save(SphereHealpix<double>& sph, char filename[], int nth=1); 
+ void save(SphereHEALPix<float>& sph, char filename[], int nth=1); 
+ void save(SphereHEALPix<double>& sph, char filename[], int nth=1); 
   
- void save(SphereHealpix<double>& sph1,SphereHealpix<double>& sph2,SphereHealpix<double>& sph3, char filename[]);   
- void save(SphereHealpix<float>& sph1,SphereHealpix<float>& sph2,SphereHealpix<float>& sph3, char filename[]);   
+ void save(SphereHEALPix<double>& sph1,SphereHEALPix<double>& sph2,SphereHEALPix<double>& sph3, char filename[]);   
+ void save(SphereHEALPix<float>& sph1,SphereHEALPix<float>& sph2,SphereHEALPix<float>& sph3, char filename[]);   
  void save(const LocalMap<double>& locm, char flnm[]);
  void save(const ImageR4& DpcImg,char flnm[]);