Changeset 1809 in Sophya for trunk/ArchTOIPipe/ProcWSophya/map2toi.cc

Timestamp:

Dec 3, 2001, 9:38:03 PM (24 years ago)

Author:

cmv

Message:

• map2toi et toi2map avec nouvelle interface sys coor et unites.
• les modifs map2toi (LocalMap) de EA sont introduites + certains bugs corriges.

cmv 3/12/01

File:

• trunk/ArchTOIPipe/ProcWSophya/map2toi.cc (modified) (7 diffs)

trunk/ArchTOIPipe/ProcWSophya/map2toi.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: map2toi.cc,v 1.9 2001-11-13 16:22:47 aubourg Exp $
+// $Id: map2toi.cc,v 1.10 2001-12-03 20:38:02 cmv Exp $
 
 #include "toimanager.h"
@@ -9 +9 @@
 #include "ctimer.h"
 #include "map2toi.h"
+// La valeur "Pi" doit etre celle de smathconst.h a cause du test sur theta
+#include "smathconst.h"
 
 ////////////////////////////////////////////////////////////////////////
@@ -14 +16 @@
 : mSph(sph)
 {
+ SetBad();
  SetEquinox();
  SetCoorIn();
@@ -26 +29 @@
 void Map2TOI::Print(::ostream & os)
 {
-  os<<"Map2TOI::Print -- Sphere NLat = "<<mSph.SizeIndex()<<endl
-
-    <<"   - Equinoxe="<<mActualYear<<endl
-
-    <<"   - TypCoorIn: Gal("<<((mTypCoorIn&TypCoordGal)?1:0)
-    <<") Eq("<<((mTypCoorIn&TypCoordEq)?1:0)
-    <<") Deg("<<((mTypCoorIn&TypCoordDD)?1:0)
-    <<") Hour("<<((mTypCoorIn&TypCoordHD)?1:0)
-    <<") Rad("<<((mTypCoorIn&TypCoordRR)?1:0)<<")"<<endl
-
-    <<"   - TypCoorMap: Gal("<<((mTypCoorMap&TypCoordGal)?1:0)
-    <<") Eq("<<((mTypCoorMap&TypCoordEq)?1:0)
-    <<") Deg("<<((mTypCoorMap&TypCoordDD)?1:0)
-    <<") Hour("<<((mTypCoorMap&TypCoordHD)?1:0)
-    <<") Rad("<<((mTypCoorMap&TypCoordRR)?1:0)<<")"<<endl;
+ os<<"Map2TOI::Print -- Sphere NLat = "<<mSph.SizeIndex()<<endl
+   <<"   - Equinoxe:   "<<mActualYear<<" y"<<endl
+   <<"   - TypCoorIn:  "<<mTypCoorIn<<" = "<<DecodeTypAstro(mTypCoorIn)<<endl
+   <<"   - TypCoorMap: "<<mTypCoorMap<<" = "<<DecodeTypAstro(mTypCoorMap)<<endl;
 }
 
@@ -89 +81 @@
 try {
 
-uint_4 mSnRead=0, mSnFilled=0;
 double mjd = MJDfrYear(mActualYear);
+cout<<"Map2TOI::run() - modified Julian day "<<mjd<<endl;
+
+uint_4 mSnRead=0, mSnFilled=0, BadCoorRange=0;
 
 for(int k=snb;k<=sne;k++) {
@@ -100 +94 @@
   mSnRead++;
 
-  // Convert CoordIn to Standard
-  double phi=-1.,theta;
-  CoordConvertToStd(mTypCoorIn,c1,c2);
+  // Conversion de CoordIn to Standard
+  double phi=-1.;
+  CoordConvertToStd(mTypCoorIn,&c1,&c2);
+
+  // Conversion dans le systeme astronomique approprie
   if(mTypCoorIn&TypCoordEq && mTypCoorMap&TypCoordGal) { // CIn=Eq  CMap=Gal
     EqtoGal(mjd,c1,c2,&c1,&c2);
-    phi   = c1 * M_PI/180.;
+    phi   = c1 * Pi/180.;
   } else if(mTypCoorIn&TypCoordGal && mTypCoorMap&TypCoordEq) { // CIn=Gal CMap=Eq
     GaltoEq(mjd,c1,c2,&c1,&c2);
-    phi   = c1 * M_PI/12.;
+    phi   = c1 * Pi/12.;
   } else if(mTypCoorMap&TypCoordGal) { // CIn=Gal CMap=Gal
-    phi   = c1 * M_PI/180.;
+    phi   = c1 * Pi/180.;
   } else if(mTypCoorMap&TypCoordEq) { // CIn=Eq CMap=Eq
-    phi   = c1 * M_PI/12.;
+    phi   = c1 * Pi/12.;
   }
-  theta = (90.-c2) * M_PI/180.;
-  if(phi<0.   || phi>=2*M_PI) flg=FlgToiOut;
-  if(theta<0. || theta>=M_PI) flg=FlgToiOut;
+  ToCoLat(&c2,TypUniteD);
+  double theta = c2 * Pi/180.;
+  if(phi<0. || phi>=2*Pi || theta<0. || theta>Pi)
+               {BadCoorRange++; flg = mBadFlag; }
 
   if(!flg) {
@@ -128 +125 @@
 }
 
-cout<<"TOI2Map::run: Samples Read "<<mSnRead<<" Filled "<<mSnFilled<<endl;
+cout<<"TOI2Map::run: Samples Read "<<mSnRead
+    <<" Filled "<<mSnFilled
+    <<" BadCoorRange="<<BadCoorRange<<endl;
 
 //---------------------------------------------------------