Changeset 1535 in Sophya for trunk/SophyaProg

Timestamp:

Jun 15, 2001, 7:04:34 PM (24 years ago)

Author:

cmv

Message:

• Quelques details
• pour masquer une shpere cmv 15/6/01

Location:

trunk/SophyaProg

Files:

• PrgMap/cl2map.cc (modified) (1 diff)
• PrgMap/cremskfrsph.cc (modified) (1 diff)
• PrgMap/msksphere.cc (added)
• PrgUtil/Makefile (modified) (3 diffs)

trunk/SophyaProg/PrgMap/cl2map.cc

@@ -111 +111 @@
 
   if (fgfitsout) {
-    cout << "--- Writing map to Output FITS file " << outfile << endl; 
+    cout << "--- Writing map to Output FITS file " << outfile << endl;
+    string dum = "rm -f "; dum += outfile; system(dum.c_str()); 
     FitsOutFile fio(outfile);
     fio << sph;

trunk/SophyaProg/PrgMap/cremskfrsph.cc

@@ -61 +61 @@
 cout<<"Sphere values : "<<sphval<<endl
     <<"Sphere mask   : "<<sphmsk<<endl
-    <<"  ...min "<<vmin<<"  max "<<vmax<<endl
+    <<"  ...min("<<tstmin<<") "<<vmin<<"  max("<<tstmax<<") "<<vmax<<endl
     <<"  ...negate "<<negate<<endl
     <<"  ...mask set value "<<vmask<<endl

trunk/SophyaProg/PrgUtil/Makefile

@@ -15 +15 @@
 LIBSORA := $(LIBS)
 LDLIBS := $(LIBS) $(LDLIBS)
-PROGS = $(EXE)runcxx $(EXE)scanppf $(EXE)scanfits $(EXE)cl2map $(EXE)map2cl $(EXE)prjsmap \
-        $(EXE)cremskfrsph $(EXE)extrapsph $(EXE)extrap2sph
-
-PROBJS = $(OBJ)runcxx.o $(OBJ)scanppf.o $(OBJ)scanfits.o $(OBJ)cl2map.o $(OBJ)map2cl.o \
-         $(OBJ)prjsmap.o $(OBJ)cremskfrsph.o $(OBJ)extrapsph.o $(OBJ)extrap2sph.o
+PROGS = $(EXE)runcxx $(EXE)scanppf $(EXE)scanfits $(EXE)cl2map $(EXE)map2cl \
+        $(EXE)prjsmap $(EXE)cremskfrsph $(EXE)msksphere $(EXE)extrapsph \
+        $(EXE)extrap2sph
+
+PROBJS = $(OBJ)runcxx.o $(OBJ)scanppf.o $(OBJ)scanfits.o $(OBJ)cl2map.o \
+         $(OBJ)map2cl.o $(OBJ)prjsmap.o $(OBJ)cremskfrsph.o $(OBJ)msksphere.o \
+         $(OBJ)extrapsph.o $(OBJ)extrap2sph.o
 
 all: $(PROGS)
@@ -61 +63 @@
         @ echo cremskfrsph done
 $(EXE)cremskfrsph: $(OBJ)cremskfrsph.o
+        $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ 
+
+msksphere: $(EXE)msksphere
+        @ echo msksphere done
+$(EXE)msksphere: $(OBJ)msksphere.o
         $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ 
 
@@ -406 +413 @@
  $(INC)fitsspherehealpix.h \
  $(INC)fitsfile.h
+$(OBJ)msksphere.o: msksphere.cc \
+ $(INC)machdefs.h \
+ $(INC)skymapinit.h \
+ $(INC)sophyainit.h \
+ $(INC)skymap.h \
+ $(INC)spherethetaphi.h \
+ $(INC)sphericalmap.h \
+ $(INC)smathconst.h \
+ $(INC)pixelmap.h \
+ $(INC)ppersist.h \
+ $(INC)pexceptions.h \
+ $(INC)gnumd5.h \
+ $(INC)dvlist.h \
+ $(INC)objfio.h \
+ $(INC)anydataobj.h \
+ $(INC)mutyv.h \
+ $(INC)spherepos.h \
+ $(INC)unitvector.h \
+ $(INC)vector3d.h \
+ $(INC)longlat.h \
+ $(INC)utilgeom.h \
+ $(INC)tvector.h \
+ $(INC)tmatrix.h \
+ $(INC)tarray.h \
+ $(INC)basarr.h \
+ $(INC)ndatablock.h \
+ $(INC)utilarr.h \
+ $(INC)spherehealpix.h \
+ $(INC)HEALPixUtils.h \
+ $(INC)localmap.h \
+ $(INC)fiospherethetaphi.h \
+ $(INC)fiospherehealpix.h \
+ $(INC)fiolocalmap.h \
+ $(INC)fitsspherehealpix.h \
+ $(INC)fitsfile.h