Changeset 2197 in Sophya for trunk/SophyaExt/FitsIOServer/fitslocalmap.cc

Timestamp:

Sep 24, 2002, 4:03:36 PM (23 years ago)

Author:

lemeur

Message:

toilette d'ete : rationalisation de types...

File:

• trunk/SophyaExt/FitsIOServer/fitslocalmap.cc (modified) (6 diffs)

trunk/SophyaExt/FitsIOServer/fitslocalmap.cc

@@ -76 +76 @@
       ownobj_= true;      
     }
-  int nbcols, nbentries;
-  nbcols = is.NbColsFromFits();
-  if (nbcols != 1) 
-    {
-      throw IOExc("le fichier fits n'est pas une LocalMap");
-    }
+  int nbentries;
+
+  // lecture sur bin-table
+  //
+  //  if (!is.IsFitsTable())
+  // {
+  //     throw PException("ReadFromFits: the fits file seems not to be a bintable");
+  //  }
+  // int nbcols;
+  // nbcols = is.NbColsFromFits();
+  // if (nbcols != 1) 
+  //  {
+  //    throw IOExc("le fichier fits n'est pas une LocalMap");
+  //  }
+  // nbentries = is.NentriesFromFits(0);
+  //
+
+  // lecture sur image fits
+  //
+  if (!is.IsFitsImage())
+    {
+      throw PException("ReadFromFits: the fits file seems not to be an image");
+    }
+  int dimension = is.nbDimOfImage();
+  if (dimension != 2 )
+    {
+      cout << " WARNING::ReadFromFits: the fits image seems not to be a matrix" << endl;
+    }
+  nbentries =  is.nbOfImageData();
+  //
+
   DVList dvl=is.DVListFromFits();
-
-  nbentries = is.NentriesFromFits(0);
+  
   int_4 nSzX = dvl.GetI("NSZX");
   int_4 nSzY = dvl.GetI("NSZY");
@@ -93 +117 @@
     }
   dobj_->ReSize(nSzX, nSzY); 
-  //  int_4 localMappingDone = dvl.GetI("LCMP");
-  // if (localMappingDone)
-  //  {
+  int_4 localMappingDone = dvl.GetI("LCMP");
+  if (localMappingDone)
+    {
       int_4 x0 = dvl.GetI("X0");
       int_4 y0 = dvl.GetI("Y0");
@@ -105 +129 @@
       double angleY = dvl.GetD("ANGLEY");
       dobj_->SetSize(angleX, angleY);
-      //  }
+    }
   // On lit les DataBlocks;
+
   dobj_->DataBlock().ReSize(nPix);
   is.GetSingleColumn(dobj_->DataBlock().Data(),nPix);
@@ -122 +147 @@
       return;
     }
-
-  DVList dvl( dobj_->Info() );  
-  dvl["NSZX"] = dobj_->Size_x();
+  int nx, ny;
+
+  DVList dvl( dobj_->Info() );
+  nx = dobj_->Size_x();  
+  dvl["NSZX"] = nx;
   dvl.SetComment("NSZX", "number of pixels in x direction");
-  dvl["NSZY"] = dobj_->Size_y();
+  ny = dobj_->Size_y();
+  dvl["NSZY"] = ny;
   dvl.SetComment("NSZY", "number of pixels in y direction");
   dvl["NPIX"] = dobj_->NbPixels();
   dvl.SetComment("NPIX", "number of pixels in local map");
 
-  // if(dobj_->LocalMap_isDone())
-  // {
-  //   dvl["LCMP"] = (int_4) 1;
-  //   dvl.SetComment("LCMP", "local mapping 1= done, 0= not done");
+  if(dobj_->LocalMap_isDone())
+    {
+      dvl["LCMP"] = (int_4) 1;
+      dvl.SetComment("LCMP", "local mapping 1= done, 0= not done");
       int_4 x0 = 0;
       int_4 y0 = 0;
@@ -159 +187 @@
       dvl["ANGLEY"] = angleY;
       dvl.SetComment("ANGLEY", "sphere angle covered by map y-extension ");
-      // }
-  // else
-  //  {
-  //    dvl["LCMP"] = (int_4) 0;
-  //  }
+    }
+  else
+    {
+      dvl["LCMP"] = (int_4) 0;
+    }
   dvl["Content"]= "LocalMap";
   dvl.SetComment("Content", "name of SOPHYA object");
@@ -171 +199 @@
   string extname("SIMULATION");
 
-  string Type;
-  if (typeid(T) == typeid(r_8) ) Type+='D';
+  // sortie sur image fits
+  //
+  char type;
+  if ( typeid(T) == typeid(r_8) ) type='D';
   else 
-    if (typeid(T) == typeid(r_4) )  Type+='E';
+    if ( typeid(T) == typeid(r_4) )  type='E';
     else
-      {
-        cout <<  " type de la LocalMap = " <<  typeid(T).name() << endl;
-        throw IOExc("FITS_LocalMap:: unknown type");
-      }
-  vector<int> dummy;
-  os.makeHeaderBntblOnFits(Type, Noms, dobj_->NbPixels(), 1, &dvl, extname, dummy);
-  os.PutColToFits(0,  dobj_->NbPixels(), dobj_->DataBlock().Data()); 
+      if ( typeid(T) == typeid(int_4) )  type='J';
+      else
+        {
+          cout <<  " type du tableau= " <<  typeid(T).name() << endl;
+          throw IOExc("FITS_LocalMap:: unknown type");
+        }
+  int nbdim = 2;
+  int* naxisn = new int[nbdim];
+  naxisn[0] = dobj_->Matrix().Size(0);
+  naxisn[1] = dobj_->Matrix().Size(1);
+  os.makeHeaderImageOnFits(type, nbdim, naxisn, &dvl);
+  os.PutImageToFits(nx*ny, dobj_->Matrix().Data());
+
+  delete [] naxisn;
+  //
+
+  // sortie sur bin-table fits
+  //
+  //  string Type;
+  //  if (typeid(T) == typeid(r_8) ) Type+='D';
+  //  else 
+  //   if (typeid(T) == typeid(r_4) )  Type+='E';
+  //   else
+  //    {
+  //    cout <<  " type de la LocalMap = " <<  typeid(T).name() << endl;
+  //    throw IOExc("FITS_LocalMap:: unknown type");
+  //    }
+  //  vector<int> dummy;
+  //  os.makeHeaderBntblOnFits(Type, Noms, dobj_->NbPixels(), 1, &dvl, extname, dummy);
+  //  os.PutColToFits(0,  dobj_->NbPixels(), dobj_->DataBlock().Data()); 
+  //
 
 }