Changeset 2044 in Sophya

Timestamp:

Jun 5, 2002, 1:58:01 PM (23 years ago)

Author:

ansari

Message:

Correction fichier Makefile et adaptation sph2lm aux modifs de GLM - Reza 5/6/2002

Location:

trunk/SophyaProg/Tests

Files:

• Makefile (modified) (2 diffs)
• sph2lm.cc (modified) (3 diffs)

trunk/SophyaProg/Tests/Makefile

@@ -6 +6 @@
 ifdef NOSHLIB
 
-LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a $(LIB)libPI.a $(LIB)libPIext.a 
-LIBS = -L$(LIB) -lPIext -lPI -lSysTools -lNTools -lBlitz  -lm
-#LIBS =  -L$(LIB) -lSysTools -lm
+LIBF =  $(LIB)libFitsIOServer.a $(LIB)libSamba.a $(LIB)libSkyMap.a $(LIB)libSkyT
+.a $(LIB)libNTools.a $(LIB)libHiStats.a $(LIB)libTArray.a $(LIB)libSysTools.a
+LIBS = -L$(LIB) -lFitsIOServer -lSamba -lSkyMap -lSkyT -lNTools -lHiStats -lTArr
+ay -lSysTools -lm
+
 ifeq ($(CXX),cxx)
 # librairie des instances de templates cxx
@@ -17 +19 @@
 
 LIBF =  $(SLB)libsophya.so 
-LIBS = -L$(SLB) -lPI -lextsophya -lsophya -lpthread -lm 
+LIBS = -L$(SLB) -lextsophya -lsophya -lpthread -lm 
 ifeq ($(MACHEROS),OSF1)
 LIBS := $(LIBS) -lfor
 endif
 ifeq ($(MACHEROS),Linux)
-LIBS := $(LIBS) -ldl -lf2c
+LIBS := $(LIBS) -ldl 
 endif
 

trunk/SophyaProg/Tests/sph2lm.cc

@@ -376 +376 @@
   }
   int filw = 0;
-  if (narg > 4) filw = atoi(arg[3]);
+  if (narg > 4) filw = atoi(arg[4]);
 
   cout << "\n >>>> Starting sph2lm: arg[1]= " << arg[1] 
@@ -432 +432 @@
          << " Longitude= " << longitude_map[nlm] << endl;
 
-    LocalMap<r_8> lm(nx_map[nlm], ny_map[nlm]);
+    LocalMap<r_8> lm(nx_map[nlm], ny_map[nlm],
+                     nx_map[nlm]*resolx_map[nlm]/60.,
+                     ny_map[nlm]*resoly_map[nlm]/60.,
+                     thetadeg_map[nlm], longitude_map[nlm],
+                     nx_map[nlm]/2, ny_map[nlm]/2);
     TMatrix<r_8> mtx(nx_map[nlm], ny_map[nlm]);
 
-    lm.SetOrigin(thetadeg_map[nlm], longitude_map[nlm]);
-    lm.SetSize(nx_map[nlm]*resolx_map[nlm]/60.,
-               ny_map[nlm]*resoly_map[nlm]/60.);
+    //    lm.SetOrigin(thetadeg_map[nlm], longitude_map[nlm]);
+    //    lm.SetSize(nx_map[nlm]*resolx_map[nlm]/60.,
+    //       ny_map[nlm]*resoly_map[nlm]/60.);
   
     lm.SetPixels((nlm+1)*100.);
@@ -447 +451 @@
     
     cout << " Doing lm.Project(sphck) ... " << endl;
-    lm.Project(sphck);
+    lm.ProjectionToSphere(sphck);
     cout << " Doing mtx.Project(sphck) ... " << endl;
     ProjectMatrix2Sph(mtx, sphckmtx, userot);