Changeset 900 in Sophya for trunk/SophyaProg/PMixer/extractRS.cc

Timestamp:

Apr 13, 2000, 10:06:55 AM (25 years ago)

Author:

ansari

Message:

Sophie: new FITS_IO server implementation...correction of a bug

File:

• trunk/SophyaProg/PMixer/extractRS.cc (modified) (8 diffs)

trunk/SophyaProg/PMixer/extractRS.cc

@@ -19 +19 @@
 #include "datacards.h"
 #include "fitsioserver.h"
-
+#include "fitsspherehealpix.h"
 #include "radspecvector.h"
 #include "blackbody.h"
@@ -28 +28 @@
 #include "specrespvector.h"
 #include "gaussfilt.h"
-
+#include "fitstarray.h"
 // -----------------------------------------------------------------
 // ------------- Function declaration ------------------------------
@@ -102 +102 @@
   try {
     
-    FitsIoServer fios; // Our FITS IO Server
+    //    FitsIoServer fios; // Our FITS IO Server
     char * flnm, buff[90];
     string key;
@@ -123 +123 @@
         TMatrix<float> ings;    
         // Opening the file containing the map
-        
-        if (printlev > 2) cout << " Processing map's frequency component No " << sk+1 << endl;
+        cout << "-------------------" << endl;
+        cout << " Processing map's frequency component No " << sk+1 << endl;
         sprintf(buff, "%d", sk+1);
         key = (string)"RADSPECMAP" + buff;
         
         flnm = BuildFITSFileName(dc.SParam(key,0));
-        if (printlev > 2) cout << " Reading Input FITS map " << (string)flnm << endl;
-        
-        fios.load(ings, flnm) ;
+        cout << " Reading Input FITS map " << (string)flnm << endl;
+        FITS_TArray<float> read_input(flnm); 
+        ings = (TArray<float>)read_input;
+
         if (printlev > 2) 
           {
@@ -232 +233 @@
         int randomPix = random*OutputMap.NbPixels();
         int outpix = random*nbOfPix; 
-        OutputMap(i) = outCoeff(outpix)*1.e18;
+        OutputMap(i) = outCoeff(outpix);
       }
 
@@ -256 +257 @@
         int outPix = random*OutputMap.NbPixels(); 
         SourceMap(outPix) = sourceCoeff(i); 
-        OutputMap(outPix) = OutputMap(i)+ SourceMap(outPix)*1.E18;
+        OutputMap(outPix) = OutputMap(i)+ SourceMap(outPix);
       }
   }  
@@ -287 +288 @@
       //       }
       {
-        FitsIoServer fios;
-        fios.save(OutputMap, arg[2]);
-        double moy,sig;
-        MeanSig(OutputMap.DataBlock(),moy,sig);
-        cout << " MeanSig for Output Map - Mean= " << moy << " Sigma= " << sig << endl;
-        cout << "Output Map (SphereHEALPix<float>) written to FITS file " 
-             << (string)(arg[2]) << endl;
+         FITS_SphereHEALPix<float> fios2(OutputMap);
+         fios2.Write(arg[2]);
+         double moy,sig;
+         MeanSig(OutputMap.DataBlock(),moy,sig);
+         cout << " MeanSig for Output Map - Mean= " << moy << " Sigma= " << sig << endl;
+         cout << "Output Map (SphereHEALPix<float>) written to FITS file " 
+              << (string)(arg[2]) << endl;
       }
       if(printlev>2) PrtTim("End of WriteFITS ");
@@ -422 +423 @@
 
   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);
+    TMatrix<float> mtx(2,10);
+    FITS_TArray<float> read_input(ifnm); 
+    mtx = (TMatrix<float>)read_input;
+
     double numin = dc.DParam(key, 2, 1.);
     double numax = dc.DParam(key, 3, 9999.);