Index: trunk/SophyaProg/PrgUtil/Makefile
===================================================================
--- trunk/SophyaProg/PrgUtil/Makefile	(revision 1373)
+++ trunk/SophyaProg/PrgUtil/Makefile	(revision 1427)
@@ -14,9 +14,6 @@
 endif
 LIBSORA := $(LIBS)
-ifdef ORACLE_HOME
-LIBSORA := -L$(LIB) -lDb++ $(LIBS) -lErosDb -L$(ORACLE_HOME)/lib -lclntsh
-endif
 LDLIBS := $(LIBS) $(LDLIBS)
-PROGS = $(EXE)runcxx $(EXE)scanppf $(EXE)scanfits
+PROGS = $(EXE)runcxx $(EXE)scanppf $(EXE)scanfits $(EXE)cl2map $(EXE)map2cl
  
 all: $(PROGS)
@@ -41,64 +38,43 @@
 	$(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ 
   
-$(OBJ)acxxrun.o: acxxrun.cc $(INC)machdefs.h \
- $(INC)systools.h \
- $(INC)sophyainit.h \
- $(INC)ppersist.h \
- $(INC)pexceptions.h \
- $(INC)gnumd5.h \
- $(INC)ndatablock.h \
- $(INC)anydataobj.h \
+cl2map: $(EXE)cl2map
+	
+$(EXE)cl2map: $(OBJ)cl2map.o
+	$(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ 
+  
+map2cl: $(EXE)map2cl
+	
+$(EXE)map2cl: $(OBJ)map2cl.o
+	$(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ 
+  
+: $(EXE)
+	
+$(EXE):
+	$(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ 
+  
+$(OBJ)cl2map.o: cl2map.cc $(INC)machdefs.h \
+ $(INC)nbmath.h \
+ $(INC)smathconst.h \
+ $(INC)timing.h \
+ $(INC)array.h \
+ $(INC)tarray.h \
+ $(INC)basarr.h \
+ $(INC)anydataobj.h \
+ $(INC)mutyv.h \
  $(INC)dvlist.h \
  $(INC)objfio.h \
- $(INC)mutyv.h \
- $(INC)pdlmgr.h \
- $(INC)perrors.h \
- $(INC)srandgen.h \
- $(INC)strutil.h \
- $(INC)ctimer.h \
- $(INC)timing.h \
- $(INC)ntools.h \
- $(INC)ntoolsinit.h \
- $(INC)tarrinit.h \
- $(INC)nbconst.h \
- $(INC)fmath.h \
- $(INC)nbrandom.h \
- $(INC)perandom.h \
- $(INC)histos.h \
- $(INC)peida.h \
- $(INC)utils.h \
+ $(INC)ppersist.h \
+ $(INC)pexceptions.h \
+ $(INC)gnumd5.h \
+ $(INC)ndatablock.h \
+ $(INC)utilarr.h \
+ $(INC)tmatrix.h \
  $(INC)tvector.h \
- $(INC)tmatrix.h \
- $(INC)tarray.h \
- $(INC)basarr.h \
- $(INC)utilarr.h \
- $(INC)nbtri.h \
- $(INC)linfit.h \
+ $(INC)matharr.h \
+ $(INC)fioarr.h \
  $(INC)sopemtx.h \
- $(INC)poly.h \
- $(INC)datatypes.h \
- $(INC)cimage.h \
- $(INC)fioarr.h \
- $(INC)dynccd.h \
- $(INC)generaldata.h \
- $(INC)ntupintf.h \
- $(INC)generalfit.h \
- $(INC)fct1dfit.h \
- $(INC)fct2dfit.h \
- $(INC)objfitter.h \
- $(INC)histos2.h \
- $(INC)hisprof.h \
- $(INC)fftpserver.h \
- $(INC)fftservintf.h \
- $(INC)array.h \
- $(INC)matharr.h \
- $(INC)histats.h \
- $(INC)histinit.h \
- $(INC)ntuple.h \
- $(INC)xntuple.h \
  $(INC)skymap.h \
  $(INC)spherethetaphi.h \
  $(INC)sphericalmap.h \
- $(INC)smathconst.h \
  $(INC)pixelmap.h \
  $(INC)spherepos.h \
@@ -115,5 +91,6 @@
  $(INC)samba.h \
  $(INC)alm.h \
- $(INC)nbmath.h \
+ $(INC)nbrandom.h \
+ $(INC)srandgen.h \
  $(INC)triangmtx.h \
  $(INC)bruit.h \
@@ -126,17 +103,76 @@
  $(INC)scan.h \
  $(INC)sphericaltransformserver.h \
+ $(INC)fftservintf.h \
+ $(INC)fftpserver.h \
  $(INC)tod.h \
- $(INC)skyt.h \
- $(INC)convtools.h \
- $(INC)radspecvector.h \
- $(INC)radspec.h \
- $(INC)specresp.h \
- $(INC)blackbody.h \
- $(INC)derivblackbody.h \
- $(INC)nupower.h \
- $(INC)specrespvector.h \
- $(INC)squarefilt.h \
- $(INC)trianglefilt.h \
- $(INC)gaussfilt.h tst.icc
+ $(INC)sambainit.h \
+ $(INC)skymapinit.h \
+ $(INC)sophyainit.h \
+ $(INC)ntoolsinit.h \
+ $(INC)tarrinit.h \
+ $(INC)fitsspherehealpix.h \
+ $(INC)fitsfile.h \
+ $(INC)fitstarray.h
+$(OBJ)map2cl.o: map2cl.cc $(INC)machdefs.h \
+ $(INC)nbmath.h \
+ $(INC)smathconst.h \
+ $(INC)timing.h \
+ $(INC)array.h \
+ $(INC)tarray.h \
+ $(INC)basarr.h \
+ $(INC)anydataobj.h \
+ $(INC)mutyv.h \
+ $(INC)dvlist.h \
+ $(INC)objfio.h \
+ $(INC)ppersist.h \
+ $(INC)pexceptions.h \
+ $(INC)gnumd5.h \
+ $(INC)ndatablock.h \
+ $(INC)utilarr.h \
+ $(INC)tmatrix.h \
+ $(INC)tvector.h \
+ $(INC)matharr.h \
+ $(INC)fioarr.h \
+ $(INC)sopemtx.h \
+ $(INC)skymap.h \
+ $(INC)spherethetaphi.h \
+ $(INC)sphericalmap.h \
+ $(INC)pixelmap.h \
+ $(INC)spherepos.h \
+ $(INC)unitvector.h \
+ $(INC)vector3d.h \
+ $(INC)longlat.h \
+ $(INC)utilgeom.h \
+ $(INC)spherehealpix.h \
+ $(INC)HEALPixUtils.h \
+ $(INC)localmap.h \
+ $(INC)fiospherethetaphi.h \
+ $(INC)fiospherehealpix.h \
+ $(INC)fiolocalmap.h \
+ $(INC)samba.h \
+ $(INC)alm.h \
+ $(INC)nbrandom.h \
+ $(INC)srandgen.h \
+ $(INC)triangmtx.h \
+ $(INC)bruit.h \
+ $(INC)circle.h \
+ $(INC)geometry.h \
+ $(INC)lambdaBuilder.h \
+ $(INC)misstime.h \
+ $(INC)mlobe.h \
+ $(INC)prefcount.h \
+ $(INC)scan.h \
+ $(INC)sphericaltransformserver.h \
+ $(INC)fftservintf.h \
+ $(INC)fftpserver.h \
+ $(INC)tod.h \
+ $(INC)sambainit.h \
+ $(INC)skymapinit.h \
+ $(INC)sophyainit.h \
+ $(INC)ntoolsinit.h \
+ $(INC)tarrinit.h \
+ $(INC)fitsspherehealpix.h \
+ $(INC)fitsfile.h \
+ $(INC)fitstarray.h
 $(OBJ)runcxx.o: runcxx.cc $(INC)sambainit.h \
  $(INC)skymapinit.h \
Index: trunk/SophyaProg/PrgUtil/programs
===================================================================
--- trunk/SophyaProg/PrgUtil/programs	(revision 1373)
+++ trunk/SophyaProg/PrgUtil/programs	(revision 1427)
@@ -2,2 +2,5 @@
 scanppf scanppf.o
 scanfits scanfits.o
+cl2map cl2map.o
+map2cl map2cl.o
+
