Changeset 1120 in Sophya for trunk/SophyaProg

Timestamp:

Jul 31, 2000, 3:47:02 PM (25 years ago)

Author:

ansari

Message:

Adaptation de PMixer aux changements suivants :

• Remplacement de l'ancienne classe Image<T> par une nouvelle, heritant

de TMatrix<T>

• Remplacement des FitsIoServer par FITS_xxx<T>

Reza 31/7/2000

Location:

trunk/SophyaProg/PMixer

Files:

• pmixer.h (modified) (1 diff)
• skymixer.cc (modified) (2 diffs)
• tgrsr.cc (modified) (1 diff)
• tgsky.cc (modified) (1 diff)

trunk/SophyaProg/PMixer/pmixer.h

@@ -18 +18 @@
 #include "pexceptions.h"
 #include "datacards.h"
-#include "fitsioserver.h"
+#include "ntuple.h"
+#include "fiospherehealpix.h"
 #include "fitsspherehealpix.h"
 #include "fitstarray.h"
+#include "cimage.h"
 
 #include "radspecvector.h"

trunk/SophyaProg/PMixer/skymixer.cc

@@ -442 +442 @@
 
   if (dc.HasKey(key) ) {      // Reading FITS filter file
-    FitsIoServer fios;
     char ifnm[256];
     strncpy(ifnm, dc.SParam(key, 1).c_str(), 255);
     ifnm[255] = '\0';
-    Matrix mtx(2,10);
-    fios.load(mtx, ifnm);
+    Matrix mtx;
+    FITS_TArray<r_8> fios(ifnm, 2);   // $CHECK$ A passer em HDU=2 , Reza 31/7/2000
+    mtx = fios; 
     double numin = dc.DParam(key, 2, 1.);
     double numax = dc.DParam(key, 3, 9999.);
@@ -496 +496 @@
     char * ifnm = BuildFITSFileName(dc.SParam(key, 0));
     cout << " Reading Input FITS spectra file " << (string)ifnm << endl;
-    FitsIoServer fios;
-    Matrix mtx(2,10);
-    fios.load(mtx, ifnm);
+    Matrix mtx;
+    FITS_TArray<r_8> fios(ifnm, 2);   // $CHECK$ A passer em HDU=2 , Reza 31/7/2000
+    mtx = fios; 
     double numin = dc.DParam(key, 2, 1.);
     double numax = dc.DParam(key, 3, 9999.);

trunk/SophyaProg/PMixer/tgrsr.cc

@@ -128 +128 @@
   PrtTim("End of filling ");
 
-  FitsIoServer fios;
+  {
   cout << "\n Writing Matrix NRows= " << mtx.NRows() << "  NCols= " 
        << mtx.NCols() << " to FITS file: " << (string)(arg[4]) << endl;
-  fios.save(mtx, arg[4]);
+  FITS_TArray<r_8> fios(&mtx);
+  fios.Write(arg[4]);   // $CHECK$ A passer em HDU=2 , Reza 31/7/2000
   PrtTim("End of Matrix->FITS ");
+  }
 
   if (narg > 5) { // Writing ImageR4 fo FITS file
     cout << "wrting ImageR4(" << npt << ", 2) to FITS file: " 
          << (string)(arg[5]) << endl;
-    fios.save(img, arg[5]);
+    FITS_TArray<r_4> fios(&img);
+    fios.Write(arg[5]);
     PrtTim("End of ImageR4->FITS ");
   }

trunk/SophyaProg/PMixer/tgsky.cc

@@ -108 +108 @@
 
 
-   
-  FitsIoServer fios;
-  fios.save(sph, arg[4]);
+  { 
+  FITS_SphereHEALPix<r_4> fios(&sph);
+  fios.Write(arg[4]);
   cout << "SphereHEALPix<float> written to FITS file " << (string)(arg[4]) << endl;
   PrtTim("End of WriteFITS ");
-
   }
-  catch (PThrowable exc) {
-    cerr << " tgsky: Catched Exception - Msg= " << exc.Msg() << endl;
+  }
+  catch (PThrowable & exc) {
+    cerr << " tgsky: Catched Exception - Msg= " << exc.Msg() 
+         << " Type=" << (string)typeid(exc).name() << endl;
   }
   catch (...) {