Changeset 2610 in Sophya for trunk/SophyaLib/SkyMap

Timestamp:

Sep 7, 2004, 3:37:53 PM (21 years ago)

Author:

ansari

Message:

Ajout classe SphereECP<T> avec sa gestionnaire PPersist - Reza , 7 Septembre 2004

Location:

trunk/SophyaLib/SkyMap

Files:

• Makefile (modified) (13 diffs)
• fiosphereecp.cc (added)
• fiosphereecp.h (added)
• objlist.list (modified) (2 diffs)
• skymap.h (modified) (1 diff)
• skymapinit.cc (modified) (2 diffs)
• sphereecp.cc (added)
• sphereecp.h (added)

trunk/SophyaLib/SkyMap/Makefile

@@ -3 +3 @@
 all: $(LIB)libSkyMap.a
 clean:
-        rm -f $(OBJ)HEALPixUtils.o $(OBJ)fiolocalmap.o $(OBJ)fiospherehealpix.o $(OBJ)fiospherethetaphi.o $(OBJ)localmap.o $(OBJ)longlat.o $(OBJ)mapoperation.o $(OBJ)skymapinit.o $(OBJ)spherehealpix.o $(OBJ)spherepos.o $(OBJ)spherethetaphi.o $(OBJ)unitvector.o $(OBJ)utilgeom.o $(OBJ)vector3d.o
+        rm -f $(OBJ)HEALPixUtils.o $(OBJ)fiolocalmap.o $(OBJ)fiosphereecp.o $(OBJ)fiospherehealpix.o $(OBJ)fiospherethetaphi.o $(OBJ)localmap.o $(OBJ)longlat.o $(OBJ)mapoperation.o $(OBJ)skymapinit.o $(OBJ)sphereecp.o $(OBJ)spherehealpix.o $(OBJ)spherepos.o $(OBJ)spherethetaphi.o $(OBJ)unitvector.o $(OBJ)utilgeom.o $(OBJ)vector3d.o
         rm -f $(LIB)libSkyMap.a
-$(LIB)libSkyMap.a : $(OBJ)HEALPixUtils.o $(OBJ)fiolocalmap.o $(OBJ)fiospherehealpix.o $(OBJ)fiospherethetaphi.o $(OBJ)localmap.o $(OBJ)longlat.o $(OBJ)mapoperation.o $(OBJ)skymapinit.o $(OBJ)spherehealpix.o $(OBJ)spherepos.o $(OBJ)spherethetaphi.o $(OBJ)unitvector.o $(OBJ)utilgeom.o $(OBJ)vector3d.o
+$(LIB)libSkyMap.a : $(OBJ)HEALPixUtils.o $(OBJ)fiolocalmap.o $(OBJ)fiosphereecp.o $(OBJ)fiospherehealpix.o $(OBJ)fiospherethetaphi.o $(OBJ)localmap.o $(OBJ)longlat.o $(OBJ)mapoperation.o $(OBJ)skymapinit.o $(OBJ)sphereecp.o $(OBJ)spherehealpix.o $(OBJ)spherepos.o $(OBJ)spherethetaphi.o $(OBJ)unitvector.o $(OBJ)utilgeom.o $(OBJ)vector3d.o
         $(ARCXX) $(ARCXXFLAGS) $@ $($(ARARGS))
 ifeq ($(CXX),cxx)
@@ -25 +25 @@
  $(INC)pexceptions.h \
  $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h \
  $(INC)utilarr.h \
  $(INC)smathconst.h
@@ -33 +36 @@
  $(INC)pexceptions.h \
  $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h \
  $(INC)dvlist.h \
  $(INC)objfio.h \
@@ -47 +53 @@
  $(INC)fiondblock.h \
  $(INC)datatype.h
+$(OBJ)fiosphereecp.o: fiosphereecp.cc fiosphereecp.h sphereecp.h \
+ sphericalmap.h $(INC)smathconst.h \
+ $(INC)machdefs.h pixelmap.h \
+ $(INC)ppersist.h \
+ $(INC)pexceptions.h \
+ $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h \
+ $(INC)dvlist.h \
+ $(INC)objfio.h \
+ $(INC)anydataobj.h \
+ $(INC)mutyv.h spherepos.h unitvector.h \
+ vector3d.h longlat.h utilgeom.h \
+ $(INC)tvector.h \
+ $(INC)tmatrix.h \
+ $(INC)tarray.h \
+ $(INC)basarr.h \
+ $(INC)ndatablock.h \
+ $(INC)utilarr.h \
+ $(INC)fioarr.h \
+ $(INC)datatype.h
 $(OBJ)fiospherehealpix.o: fiospherehealpix.cc fiospherehealpix.h \
  sphericalmap.h $(INC)smathconst.h \
@@ -53 +81 @@
  $(INC)pexceptions.h \
  $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h \
  $(INC)dvlist.h \
  $(INC)objfio.h \
@@ -72 +103 @@
  $(INC)pexceptions.h \
  $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h \
  $(INC)dvlist.h \
  $(INC)objfio.h \
@@ -90 +124 @@
  $(INC)pexceptions.h \
  $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h \
  $(INC)dvlist.h \
  $(INC)objfio.h \
@@ -113 +150 @@
  $(INC)pexceptions.h \
  $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h \
  $(INC)dvlist.h \
  $(INC)objfio.h \
@@ -124 +164 @@
  $(INC)pexceptions.h \
  $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h \
  $(INC)dvlist.h \
  $(INC)objfio.h \
@@ -136 +179 @@
  $(INC)utilarr.h fiospherehealpix.h \
  spherehealpix.h HEALPixUtils.h fiospherethetaphi.h fiolocalmap.h \
- localmap.h
+ localmap.h fiosphereecp.h sphereecp.h
+$(OBJ)sphereecp.o: sphereecp.cc sphereecp.h sphericalmap.h \
+ $(INC)smathconst.h \
+ $(INC)machdefs.h pixelmap.h \
+ $(INC)ppersist.h \
+ $(INC)pexceptions.h \
+ $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h \
+ $(INC)dvlist.h \
+ $(INC)objfio.h \
+ $(INC)anydataobj.h \
+ $(INC)mutyv.h spherepos.h unitvector.h \
+ vector3d.h longlat.h utilgeom.h \
+ $(INC)tvector.h \
+ $(INC)tmatrix.h \
+ $(INC)tarray.h \
+ $(INC)basarr.h \
+ $(INC)ndatablock.h \
+ $(INC)utilarr.h
 $(OBJ)spherehealpix.o: spherehealpix.cc \
  $(INC)machdefs.h \
@@ -143 +206 @@
  $(INC)ppersist.h \
  $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h \
  $(INC)ndatablock.h \
  $(INC)anydataobj.h spherehealpix.h \
@@ -160 +226 @@
  $(INC)ppersist.h \
  $(INC)pexceptions.h \
- $(INC)gnumd5.h unitvector.h vector3d.h \
+ $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h unitvector.h vector3d.h \
  longlat.h utilgeom.h $(INC)anydataobj.h \
  $(INC)datatype.h
@@ -169 +238 @@
  $(INC)pexceptions.h \
  $(INC)gnumd5.h \
+ $(INC)ppfbinstream.h \
+ $(INC)rawstream.h \
+ $(INC)ppfnametag.h \
  $(INC)dvlist.h \
  $(INC)objfio.h \

trunk/SophyaLib/SkyMap/objlist.list

@@ -1 +1 @@
 HEALPixUtils.o
 fiolocalmap.o
+fiosphereecp.o
 fiospherehealpix.o
 fiospherethetaphi.o
@@ -7 +8 @@
 mapoperation.o
 skymapinit.o
+sphereecp.o
 spherehealpix.o
 spherepos.o

trunk/SophyaLib/SkyMap/skymap.h

@@ -9 +9 @@
 #include "spherehealpix.h"
 #include "localmap.h"
+#include "sphereecp.h"
 #include "fiospherethetaphi.h"
 #include "fiospherehealpix.h"
 #include "fiolocalmap.h"
+#include "fiosphereecp.h"
 
 #endif

trunk/SophyaLib/SkyMap/skymapinit.cc

@@ -8 +8 @@
 #include "fiospherethetaphi.h"
 #include "fiolocalmap.h"
-#include "localmap.h"
+#include "fiosphereecp.h"
  
 /*!
@@ -85 +85 @@
   DObjRegister(FIO_LocalMap< complex<r_8> >, LocalMap< complex<r_8> >);
 
+  // ---------- Les SphereECP ---------
+
+  PPRegister(FIO_SphereECP<int_4>);
+  DObjRegister(FIO_SphereECP<int_4>, SphereECP<int_4>);
+
+  PPRegister(FIO_SphereECP<r_4>);
+  DObjRegister(FIO_SphereECP<r_4>, SphereECP<r_4>);
+
+  PPRegister(FIO_SphereECP<r_8>);
+  DObjRegister(FIO_SphereECP<r_8>, SphereECP<r_8>);
+
+  PPRegister(FIO_SphereECP< complex<r_4> >);
+  DObjRegister(FIO_SphereECP< complex<r_4> >, SphereECP< complex<r_4> >);
+
+  PPRegister(FIO_SphereECP< complex<r_8> >);
+  DObjRegister(FIO_SphereECP< complex<r_8> >, SphereECP< complex<r_8> >);
+
+
 
 }