Changeset 841 in Sophya for trunk/SophyaLib/SkyMap

Timestamp:

Apr 7, 2000, 5:51:36 PM (25 years ago)

Author:

ansari

Message:

FIO fichiers separes

Location:

trunk/SophyaLib/SkyMap

Files:

• localmap.cc (modified) (3 diffs)
• localmap.h (modified) (2 diffs)
• skymapinit.cc (modified) (3 diffs)
• skymapinit.h (modified) (2 diffs)

trunk/SophyaLib/SkyMap/localmap.cc

@@ -550 +550 @@
 //--
 
-//*******************************************************************
-// class FIO_LocalMap<T>
-//  Les objets delegues pour la gestion de persistance 
-//*******************************************************************
-
-//++
-template <class T>
-FIO_LocalMap<T>::FIO_LocalMap()
-//
-//--
-{
-  dobj= new LocalMap<T>;
-  ownobj= true;
-}
-//++
-template <class T>
-FIO_LocalMap<T>::FIO_LocalMap(string const& filename)
-//
-//--
-{
-  dobj= new LocalMap<T>;
-  dobj->DataBlock().SetTemp(true);
-  ownobj= true;
-  Read(filename);
-}
-
-//++
-template <class T>
-FIO_LocalMap<T>::FIO_LocalMap(const LocalMap<T>& obj)
-//
-//--
-{
-  dobj= new LocalMap<T>(obj, true);
-  dobj->DataBlock().SetTemp(true);
-  ownobj= true;
-}
-
-template <class T>
-FIO_LocalMap<T>::FIO_LocalMap(LocalMap<T>* obj)
-{
-  dobj= obj;
-  ownobj= false;
-}
-
-//++
-template <class T>
-FIO_LocalMap<T>::~FIO_LocalMap()
-//
-//--
-{
-  if (ownobj && dobj) delete dobj;
-}
-
-//++
-template <class T>
-AnyDataObj* FIO_LocalMap<T>::DataObj()
-//
-//--
-{
-  return(dobj);
-}
-
-//++
-template <class T>
-void FIO_LocalMap<T>::SetDataObj(AnyDataObj & o)
-//
-//--
-{
-  LocalMap<T> * po = dynamic_cast< LocalMap<T> * >(&o);
-  if (po == NULL) return;
-  if (ownobj && dobj) delete dobj;
-  dobj = po; ownobj = false;
-} 
-
-//++
-template <class T>
-void FIO_LocalMap<T>::ReadSelf(PInPersist& is)
-//
-//--
-{
-
-  if(dobj == NULL) 
-    {
-      dobj= new LocalMap<T>;
-      dobj->DataBlock().SetTemp(true);
-      ownobj= true;
-    }
-
-  // Pour savoir s'il y avait un DVList Info associe
-  char strg[256];
-  is.GetLine(strg, 255);
-  bool hadinfo= false;
-  if(strncmp(strg+strlen(strg)-7, "HasInfo", 7) == 0)  hadinfo= true;
-  if(hadinfo) 
-    {    // Lecture eventuelle du DVList Info
-      is >> dobj->Info(); 
-    }
-
-  int_4 nSzX;
-  is.GetI4(nSzX);
-  //  dobj->setSize_x(nSzX);
-
-  int_4 nSzY;
-  is.GetI4(nSzY);
-  //  dobj->setSize_y(nSzY);
-
-  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);
-
-      double angleX, angleY;
-      is.GetR8(angleX);
-      is.GetR8(angleY);
-      dobj->SetSize(angleX, angleY);
-    }
-
-// On lit le DataBlock;
-  FIO_NDataBlock<T> fio_nd(&dobj->DataBlock());
-  fio_nd.Read(is);
-}
-
-//++
-template <class T>
-void FIO_LocalMap<T>::WriteSelf(POutPersist& os) const
-//
-//--
-{
-  if(dobj == NULL) 
-    {
-      cout << " FIO_LocalMap::WriteSelf:: dobj= null " << endl;
-      return;
-    }
-
-  char strg[256];
-  int_4 nSzX= dobj->Size_x();
-  int_4 nSzY= dobj->Size_y();
-  int_4 nPix= dobj->NbPixels();
- 
-  if(dobj->ptrInfo()) 
-    {
-      sprintf(strg,"LocalMap: NPixX=%6d  NPixY=%9d HasInfo",nSzX,nSzY);
-      os.PutLine(strg);
-      os << dobj->Info();
-    }
-  else 
-    { 
-      sprintf(strg,"LocalMap: NPixX=%6d  NPixY=%9d ",nSzX,nSzY);
-      os.PutLine(strg);  
-    }
-
-  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);
-
-      double angleX, angleY;
-      dobj->Aperture(angleX, angleY);
-      os.PutR8(angleX);
-      os.PutR8(angleY);
-    }
-  else
-    {
-      string ss("no local mapping");
-      os.PutStr(ss);
-    }
-
-// On ecrit le dataBlock 
-  FIO_NDataBlock<T> fio_nd(&dobj->DataBlock());
-  fio_nd.Write(os);
-}
 
 #ifdef __CXX_PRAGMA_TEMPLATES__
@@ -753 +556 @@
 #pragma define_template LocalMap< complex<r_8> >
 #pragma define_template LocalMap< complex<r_4> >
-#pragma define_template FIO_LocalMap<r_8>
-#pragma define_template FIO_LocalMap<r_4>
-#pragma define_template FIO_LocalMap< complex<r_4> >
-#pragma define_template FIO_LocalMap< complex<r_8> >
 #endif
 #if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
@@ -763 +562 @@
 template class LocalMap< complex<r_8> >;
 template class LocalMap< complex<r_4> >;
-template class FIO_LocalMap<r_8>;
-template class FIO_LocalMap<r_4>;
-template class FIO_LocalMap< complex<r_4> >;
-template class FIO_LocalMap< complex<r_8> >;
 #endif

trunk/SophyaLib/SkyMap/localmap.h

@@ -58 +58 @@
 // ***************** Class LocalMap *****************************
 
+
+
+namespace SOPHYA {
+
+
 template<class T>
 class LocalMap : public PixelMap<T>
@@ -206 +211 @@
 };
 
-// ------------- Classe pour la gestion de persistance --
-//!    Delegated objects for persitance management
-template <class T>
-class FIO_LocalMap : public PPersist  
-{
-
-public:
-
-FIO_LocalMap();
-FIO_LocalMap(string const & filename); 
-FIO_LocalMap(const LocalMap<T>& obj);
-FIO_LocalMap(LocalMap<T>* obj);
-virtual ~FIO_LocalMap();
-virtual AnyDataObj* DataObj();
-virtual void        SetDataObj(AnyDataObj & o);
-inline operator LocalMap<T>() { return(*dobj); }
-
-protected :
-
-virtual void ReadSelf(PInPersist&);           
-virtual void WriteSelf(POutPersist&) const;  
-LocalMap<T>* dobj;
-bool ownobj;
-};
+
+
+} // Fin du namespace
 
 #endif

trunk/SophyaLib/SkyMap/skymapinit.cc

@@ -1 +1 @@
 // Classe d'initialisation du module Outils++ 
+#include "machdefs.h"
+#include "skymapinit.h" 
+
 #include <unistd.h>
-
-#include "skymapinit.h"
 #include "spherethetaphi.h"
-#include "spheregorski.h"
+#include "fiospherehealpix.h"
+#include "fiospherethetaphi.h"
+#include "fiolocalmap.h"
 #include "localmap.h"
-
+ 
 int SkyMapInitiator::FgInit = 0;
 
 SkyMapInitiator::SkyMapInitiator()
-  : TArrayInitiator()
+  : SophyaInitiator()
 {
-  SkyMapInitiator::FgInit++;
-  if (SkyMapInitiator::FgInit > 1)  return;
+  FgInit++;
+  if (FgInit > 1)  return;
 
-//   Enregistrement des classes PPersist du modules Outils++
+//   Enregistrement des classes PPersist du module SkyMap
   
   PPRegister(FIO_SphereCoordSys);
+  DObjRegister(FIO_SphereCoordSys, SphereCoordSys);
 
   PPRegister(FIO_SphereThetaPhi<r_4>);
+  DObjRegister(FIO_SphereThetaPhi<r_4>, SphereThetaPhi<r_4>);
+
   PPRegister(FIO_SphereThetaPhi<r_8>);
+  DObjRegister(FIO_SphereThetaPhi<r_8>, SphereThetaPhi<r_8>);
+
   PPRegister(FIO_SphereThetaPhi< complex<r_4> >);
+  DObjRegister(FIO_SphereThetaPhi< complex<r_4> >, SphereThetaPhi< complex<r_4> >);
+
   PPRegister(FIO_SphereThetaPhi< complex<r_8> >);
+  DObjRegister(FIO_SphereThetaPhi< complex<r_8> >, SphereThetaPhi< complex<r_8> >);
 
-  PPRegister(FIO_SphereGorski<r_4>);
-  PPRegister(FIO_SphereGorski<r_8>);
-  PPRegister(FIO_SphereGorski< complex<r_4> >);
-  PPRegister(FIO_SphereGorski< complex<r_8> >);
+  PPRegister(FIO_SphereHealpix<r_4>);  
+  DObjRegister(FIO_SphereHealpix<r_4>, SphereHealpix<r_4>);
+
+  PPRegister(FIO_SphereHealpix<r_8>);
+  DObjRegister(FIO_SphereHealpix<r_8>, SphereHealpix<r_8>);
+
+  PPRegister(FIO_SphereHealpix< complex<r_4> >);
+  DObjRegister(FIO_SphereHealpix< complex<r_4> >, SphereHealpix< complex<r_4> >);
+
+  PPRegister(FIO_SphereHealpix< complex<r_8> >);
+  DObjRegister(FIO_SphereHealpix< complex<r_8> >, SphereHealpix< complex<r_8> >);
 
   PPRegister(FIO_LocalMap<r_4>);
+  DObjRegister(FIO_LocalMap<r_4>, LocalMap<r_4>);
+
   PPRegister(FIO_LocalMap<r_8>);
+  DObjRegister(FIO_LocalMap<r_8>, LocalMap<r_8>);
+
   PPRegister(FIO_LocalMap< complex<r_4> >);
+  DObjRegister(FIO_LocalMap< complex<r_4> >, LocalMap< complex<r_4> >);
+
   PPRegister(FIO_LocalMap< complex<r_8> >);
+  DObjRegister(FIO_LocalMap< complex<r_8> >, LocalMap< complex<r_8> >);
 
 
@@ -39 +64 @@
 SkyMapInitiator::~SkyMapInitiator()
 {
-  SkyMapInitiator::FgInit--;
+  FgInit--;
 }
 
@@ -47 +72 @@
 static SkyMapInitiator s_sskymapinit_;
 
+ 

trunk/SophyaLib/SkyMap/skymapinit.h

@@ -7 +7 @@
 
 // Classe d''initialisation pour le modules SkyMap
-#include "tarrinit.h"
+#include "sophyainit.h"
 
-class SkyMapInitiator : public TArrayInitiator {
+namespace SOPHYA {
+
+class SkyMapInitiator : public SophyaInitiator {
 private:
   static int FgInit;
@@ -20 +22 @@
 #define SophyaInit() SkyMapInitiator skymapinitiator
 
+} // Fin du namespace
+
 #endif