Changeset 1520 in Sophya for trunk/ArchTOIPipe/ProcWSophya

Timestamp:

Jun 12, 2001, 7:40:20 PM (24 years ago)

Author:

cmv

Message:

Re-shape de map2toi cmv 12/6/01

Location:

trunk/ArchTOIPipe/ProcWSophya

Files:

• map2toi.cc (modified) (4 diffs)
• map2toi.h (modified) (2 diffs)
• toi2map.cc (modified) (1 diff)
• toi2map.h (modified) (1 diff)

trunk/ArchTOIPipe/ProcWSophya/map2toi.cc

@@ -8 +8 @@
 : mSph(sph)
 {
+ SetEquinox();
+ SetCoorIn();
+ SetCoorMap();
 }
 
@@ -17 +20 @@
 void Map2TOI::init() {
   cout << "Map2TOI::init" << endl;
-  declareInput("AlphaIn");     // input  index 0
-  declareInput("DeltaIn");     // input  index 1
-  declareOutput("AlphaOut");   // output index 0
-  declareOutput("DeltaOut");   // output index 1
-  declareOutput("BoloOut");    // output index 2
+  declareInput("Coord1In");     // input  index 0
+  declareInput("Coord2In");     // input  index 1
+  declareOutput("Coord1Out");   // output index 0
+  declareOutput("Coord2Out");   // output index 1
+  declareOutput("BoloOut");     // output index 2
 }
 
@@ -39 +42 @@
 }
 if(!checkInputTOIIndex(0) || !checkInputTOIIndex(1)) {
-  cout<<"Map2TOI::run() - Input TOI (AlphaIn or DeltaIn) not connected! "<<endl;
-  throw ParmError("Map2TOI::run() Output TOI (AlphaIn or DeltaIn) not connected!");
+  cout<<"Map2TOI::run() - Input TOI (Coord1In or Coord2In) not connected! "<<endl;
+  throw ParmError("Map2TOI::run() Output TOI (Coord1In or Coord2In) not connected!");
 }
-bool connected_AlphaOut = checkOutputTOIIndex(0);
-bool connected_DeltaOut = checkOutputTOIIndex(1);
+bool connected_Coord1Out = checkOutputTOIIndex(0);
+bool connected_Coord2Out = checkOutputTOIIndex(1);
 if(!checkOutputTOIIndex(2)) {
   cout<<"Map2TOI::run() - Output TOI (BoloOut) not connected! "<<endl;
   throw ParmError("Map2TOI::run() Output TOI (BoloOut) not connected!");
+}
+if( !(mTypCoorIn&TypCoordEq || mTypCoorIn&TypCoordGal) ) {
+  cout<<"Map2TOI::run() - CoordIn Coordinates not Eq or Gal! "<<endl;
+  throw ParmError("Map2TOI::run() - CoordIn Coordinates not Eq or Gal!");
+}
+if( !(mTypCoorMap&TypCoordEq || mTypCoorMap&TypCoordGal) ) {
+  cout<<"Map2TOI::run() - Sphere Coordinates not Eq or Gal! "<<endl;
+  throw ParmError("Map2TOI::run() - Sphere Coordinates not Eq or Gal!");
 }
 
@@ -52 +63 @@
 try {
 
+uint_4 mSnRead=0, mSnFilled=0;
+double mjd = MJDfrYear(mActualYear);
+
 for(int k=snb;k<=sne;k++) {
 
   int_8 flg = 0;
-  //  double alpha = getData(0,k); // alpha entre [0,24[ en heures
-  //  if(alpha<0. || alpha>=24.) flg=1;
-  // On passe l'angle en longitude en degres - de [0,360[ deg
-  double alpha = getData(0,k); // alpha entre [0,360[ en heures
-  if(alpha<0. || alpha>=360.) flg=1;
-  double delta = getData(1,k); // delta entre [-90,90] en degres
-  if(delta<-90. || delta>90.) flg=1;
-  double bolo = -99999.;
+  double coord1 = getData(0,k);
+  double coord2 = getData(1,k);
+  double c1 = coord1, c2=coord2, bolo = -99999.;
+  mSnRead++;
+
+  // Convert CoordIn to Standard
+  double phi=-1.,theta;
+  CoordConvertToStd(mTypCoorIn,c1,c2);
+  if(mTypCoorIn&TypCoordEq && mTypCoorMap&TypCoordGal) { // CIn=Eq  CMap=Gal
+    EqtoGal(mjd,c1,c2,&c1,&c2);
+    phi   = c1 * M_PI/180.;
+  } else if(mTypCoorIn&TypCoordGal && mTypCoorMap&TypCoordEq) { // CIn=Gal CMap=Eq
+    GaltoEq(mjd,c1,c2,&c1,&c2);
+    phi   = c1 * M_PI/12.;
+  } else if(mTypCoorMap&TypCoordGal) { // CIn=Gal CMap=Gal
+    phi   = c1 * M_PI/180.;
+  } else if(mTypCoorMap&TypCoordEq) { // CIn=Eq CMap=Eq
+    phi   = c1 * M_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;
 
   if(!flg) {
-    //    double phi   = alpha *M_PI/12.; // sphere phi entre [0,2*Pi] en radian
-    double phi   = alpha *M_PI/180.; // sphere phi entre [0,2*Pi] en radian
-    double teta  = (90.-delta) *M_PI/180.; // sphere teta entre [0,Pi] en radian
-    bolo = mSph(teta,phi);
+    bolo = mSph(theta,phi);
+    mSnFilled++;
   }
 
-  if(connected_AlphaOut) putData(0,k,alpha,0);
-  if(connected_DeltaOut) putData(1,k,delta,0);
+  if(connected_Coord1Out) putData(0,k,coord1,flg);
+  if(connected_Coord2Out) putData(1,k,coord2,flg);
   putData(2,k,bolo,flg);
 }
+
+cout<<"TOI2Map::run: Samples Read "<<mSnRead<<" Filled "<<mSnFilled<<endl;
 
 //---------------------------------------------------------

trunk/ArchTOIPipe/ProcWSophya/map2toi.h

@@ -5 +5 @@
 #include "toiprocessor.h"
 #include "spherehealpix.h"
+#include "flagtoidef.h"
+#include "xastropack.h"
 
-//-- Un generateur de TOI a partir d'une sphere et de 2 TOIs alpha,delta
-// Lecture de 2 TOI alpha,delta et d'une Sphere Healpix
-// Sortie de 3 TOI alpha,delta,boloMuV
+//-- Un generateur de TOI a partir d'une sphere et de 2 TOIs coordin1,coordin2
+// Lecture de 2 TOI coord1,coord2 et d'une Sphere Healpix
+// Sortie de 3 TOI coord1,coord2,boloMuV
 //
 // Structure generale :
-// (les alpha[0,360[,delta[-90,90] sont en degres decimaux)
 //             Sphere ---- |
 //                         |
-//                    -----------
-//   toi AlphaIn ---> |         | ---> toi AlphaOut
-//                    | Map2TOI | ---> toi DeltaOut
-//   toi DeltaIn ---> |         | ---> toi BoloOut
-//                    -----------
+//                     -----------
+//   toi CoordIn1 ---> |         | ---> toi CoordOut1
+//                     | Map2TOI | ---> toi CoordOut2
+//   toi CoordIn2 ---> |         | ---> toi BoloOut
+//                     -----------
+// Gestion du type de coordonnees :
+// Coord1In,Coord2In : soit Equatoriales (Alpha,Delta)
+//                     soit Galactiques  (GLong,GLat)
+// La sphere peut avoir des coordonnees differentes des CoordIn
+// Si les CoordIn et les CoordSphere sont equatoriales -> meme equinoxe!
+// La sortie CoordOut aura les MEMES coordonnees que les CoordIn
 
 class Map2TOI : public TOIProcessor {
@@ -25 +32 @@
   virtual       ~Map2TOI();
 
-  virtual void  init(void);  
+  virtual void  init(void);
   virtual void  run(void);
-  
+
+  // Pour savoir si on a de HourDeg,DegDeg,RadRad
+  inline void SetEquinox(double actualyear=2000.)
+              {mActualYear = actualyear;}
+  inline void SetCoorIn(TypAstroCoord mfg=TypCoordGalStd)
+              {mTypCoorIn = mfg;}
+  inline void SetCoorMap(TypAstroCoord mfg=TypCoordGalStd)
+              {mTypCoorMap = mfg;}
+
 protected:
   SphereHEALPix<r_8>& mSph;
+  TypAstroCoord mTypCoorIn,mTypCoorMap;
+  double mActualYear;
 };
 

trunk/ArchTOIPipe/ProcWSophya/toi2map.cc

@@ -96 +96 @@
   // sphere phi   entre [0,2*Pi] en radians
   // sphere theta entre [0,Pi]   en radians
-  double phi,theta;
+  double phi=-1.,theta;
   CoordConvertToStd(mTypCoorIn,coord1,coord2);
   if(mTypCoorIn&TypCoordEq && mTypCoorOut&TypCoordGal) { // Eq -> Gal

trunk/ArchTOIPipe/ProcWSophya/toi2map.h

@@ -24 +24 @@
 //                     soit Galactiques  (GLong,GLat)
 // Sortie sur une sphere en coordonnees Equatoriales ou Galactiques
+// Si les CoordIn et les CoordOut sont equatoriales -> meme equinoxe!
 
 class TOI2Map : public TOIProcessor {