Changeset 2013 in Sophya for trunk/SophyaLib/SkyMap/fiolocalmap.cc

Timestamp:

May 24, 2002, 4:54:53 PM (23 years ago)

Author:

lemeur

Message:

amelioration de la projection de localmap

File:

• trunk/SophyaLib/SkyMap/fiolocalmap.cc (modified) (5 diffs)

trunk/SophyaLib/SkyMap/fiolocalmap.cc

@@ -2 +2 @@
 
 #include "fiolocalmap.h"
+#include "fioarr.h"
 #include "pexceptions.h"
 #include "fiondblock.h"
@@ -115 +116 @@
   //  dobj->setSize_y(nSzY);
 
-  int_4 nPix;
-  is.GetI4(nPix);
+  // int_4 nPix;
+  // is.GetI4(nPix);
   //  dobj->setNbPixels(nPix);
   dobj->ReSize(nSzX, nSzY); 
-  string ss("local mapping is done");
-  string sso;
-  is.GetStr(sso);
-  if(sso == ss)
-    {
-      cout<<" ReadSelf:: local mapping"<<endl;
-      int_4 x0, y0;
-      double theta, phi, angle;
-      is.GetI4(x0);
-      is.GetI4(y0);
-      is.GetR8(theta);
-      is.GetR8(phi);
-      is.GetR8(angle);
-      dobj->SetOrigin(theta, phi, x0, y0, angle);
+  //  string ss("local mapping is done");
+  // string sso;
+  // is.GetStr(sso);
+  // if(sso == ss)
+  //  {
+  //   cout<<" ReadSelf:: local mapping"<<endl;
 
       double angleX, angleY;
@@ -138 +131 @@
       is.GetR8(angleY);
       dobj->SetSize(angleX, angleY);
-    }
+
+
+      int_4 x0, y0;
+      double theta, phi, angle;
+      is.GetR8(theta);
+      is.GetR8(phi);
+      is.GetI4(x0);
+      is.GetI4(y0);
+      is.GetR8(angle);
+      dobj->SetOrigin(theta, phi, x0, y0, angle);
+
+      //  }
 
 // On lit le DataBlock;
-  FIO_NDataBlock<T> fio_nd(&dobj->DataBlock());
+      //  FIO_NDataBlock<T> fio_nd(&dobj->DataBlock());
+// On lit la matrice;
+  FIO_TArray<T> fio_nd(&dobj->Matrix());
   fio_nd.Read(is);
 }
@@ -176 +182 @@
   os.PutI4(nSzX);
   os.PutI4(nSzY);
-  os.PutI4(nPix);
-
-  if(dobj->LocalMap_isDone())
-    {
-      string ss("local mapping is done");
-      os.PutStr(ss);
-      int_4 x0, y0;
-      double theta, phi, angle;
-      dobj->Origin(theta, phi, x0, y0, angle);
-      os.PutI4(x0);
-      os.PutI4(y0);
-      os.PutR8(theta);
-      os.PutR8(phi);
-      os.PutR8(angle);
+  //  os.PutI4(nPix);
+
+  // if(dobj->LocalMap_isDone())
+  // {
+  //   string ss("local mapping is done");
+  //    os.PutStr(ss);
 
       double angleX, angleY;
@@ -195 +193 @@
       os.PutR8(angleX);
       os.PutR8(angleY);
-    }
-  else
-    {
-      string ss("no local mapping");
-      os.PutStr(ss);
-    }
+
+
+      int_4 x0, y0;
+      double theta, phi, angle;
+      dobj->Origin(theta, phi, x0, y0, angle);
+      os.PutR8(theta);
+      os.PutR8(phi);
+      os.PutI4(x0);
+      os.PutI4(y0);
+      os.PutR8(angle);
+
+      // }
+// else
+//  {
+//   string ss("no local mapping");
+//   os.PutStr(ss);
+//  }
 
 // On ecrit le dataBlock 
-  FIO_NDataBlock<T> fio_nd(&dobj->DataBlock());
+      //  FIO_NDataBlock<T> fio_nd(&dobj->DataBlock());
+// On ecrit la matrice 
+  FIO_TArray<T> fio_nd(&dobj->Matrix());
   fio_nd.Write(os);
 }