Changeset 1311 in Sophya for trunk/SophyaExt

Timestamp:

Nov 9, 2000, 4:39:42 PM (25 years ago)

Author:

ansari

Message:

MAJ Makefile , Reza 9/11/2000

Location:

trunk/SophyaExt/FitsIOServer

Files:

• Makefile (modified) (2 diffs)
• fitsfile.cc (modified) (4 diffs)

trunk/SophyaExt/FitsIOServer/Makefile

@@ -3 +3 @@
 all: $(LIB)libFitsIOServer.a
 clean:
-        rm -f $(OBJ)fitsbntbllineRW.o $(OBJ)fitsfile.o $(OBJ)fitslocalmap.o $(OBJ)fitsntuple.o $(OBJ)fitsspherehealpix.o $(OBJ)fitstarray.o $(OBJ)fitsxntuple.o
+        rm -f $(OBJ)fitsautoreader.o $(OBJ)fitsbntbllineRW.o $(OBJ)fitsfile.o $(OBJ)fitslocalmap.o $(OBJ)fitsntuple.o $(OBJ)fitsspherehealpix.o $(OBJ)fitstarray.o $(OBJ)fitsxntuple.o
         rm -f $(LIB)libFitsIOServer.a
-$(LIB)libFitsIOServer.a : $(OBJ)fitsbntbllineRW.o $(OBJ)fitsfile.o $(OBJ)fitslocalmap.o $(OBJ)fitsntuple.o $(OBJ)fitsspherehealpix.o $(OBJ)fitstarray.o $(OBJ)fitsxntuple.o
+$(LIB)libFitsIOServer.a : $(OBJ)fitsautoreader.o $(OBJ)fitsbntbllineRW.o $(OBJ)fitsfile.o $(OBJ)fitslocalmap.o $(OBJ)fitsntuple.o $(OBJ)fitsspherehealpix.o $(OBJ)fitstarray.o $(OBJ)fitsxntuple.o
         $(ARCXX) $(ARCXXFLAGS) $@ $?
 ifeq ($(CXX),cxx)
@@ -11 +11 @@
 endif 
  
+$(OBJ)fitsautoreader.o: fitsautoreader.cc \
+ $(INC)pexceptions.h \
+ $(INC)machdefs.h fitsautoreader.h \
+ $(INC)anydataobj.h fitsfile.h \
+ $(INC)ndatablock.h \
+ $(INC)dvlist.h \
+ $(INC)objfio.h \
+ $(INC)ppersist.h \
+ $(INC)gnumd5.h \
+ $(INC)mutyv.h \
+ $(EXTINCPATH)FitsIO/fitsio.h \
+ $(EXTINCPATH)FitsIO/longnam.h fitstarray.h \
+ $(INC)tarray.h \
+ $(INC)basarr.h \
+ $(INC)utilarr.h fitsspherehealpix.h \
+ $(INC)spherehealpix.h \
+ $(INC)sphericalmap.h \
+ $(INC)smathconst.h \
+ $(INC)pixelmap.h \
+ $(INC)spherepos.h \
+ $(INC)unitvector.h \
+ $(INC)vector3d.h \
+ $(INC)longlat.h \
+ $(INC)utilgeom.h \
+ $(INC)tvector.h \
+ $(INC)tmatrix.h \
+ $(INC)HEALPixUtils.h fitsntuple.h \
+ $(INC)ntuple.h \
+ $(INC)ntupintf.h fitsxntuple.h \
+ $(INC)xntuple.h fitslocalmap.h \
+ $(INC)localmap.h
 $(OBJ)fitsbntbllineRW.o: fitsbntbllineRW.cc \
  $(INC)pexceptions.h \

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -1644 +1644 @@
   for(it = dvl.Begin(); it != dvl.End(); it++)
     {
-      char keytype= (*it).second.elval.typ;
+      MuTyV::MTVType keytype= (*it).second.elval.Type();
       char keyname[10];
       strncpy(keyname,(*it).first.substr(0,64).c_str(),10);
@@ -1661 +1661 @@
           switch (keytype)
             {
-            case 'I' :
+            case MuTyV::MTVInteger :
               {
                 int ival = (int)dvl.GetI(key);
@@ -1667 +1667 @@
                 break;
               }
-            case 'D' :
+            case MuTyV::MTVFloat :
               {
                 double dval= (double)dvl.GetD(key);
@@ -1673 +1673 @@
                 break;
               }
-            case 'S' :
+            case MuTyV::MTVString :
               {
                 char strvaleur[FLEN_VALUE]= "";