Changeset 1498 in Sophya for trunk/ArchTOIPipe/ProcWSophya

Timestamp:

May 17, 2001, 5:43:42 PM (24 years ago)

Author:

ansari

Message:

Commit de la modif toi2map.cc .h par Cecile - Reza 17/5/2001

Location:

trunk/ArchTOIPipe/ProcWSophya

Files:

• toi2map.cc (modified) (4 diffs)
• toi2map.h (modified) (3 diffs)

trunk/ArchTOIPipe/ProcWSophya/toi2map.cc

@@ -8 +8 @@
 ////////////////////////////////////////////////////////////////////////
 TOI2Map::TOI2Map(SphereHEALPix<r_8>* sph,SphereHEALPix<r_8>* wsph)
-  : mSph(sph), mWSph(wsph), mWSphInternal(false), mTypCoor(false), mActualYear(2001.)
+  : mSph(sph), mWSph(wsph), mWSphInternal(false), mTypCoor(false), fTypCoor(false), mActualYear(2001.)
 {
  if(mSph->NbPixels()<1) {
@@ -42 +42 @@
 void TOI2Map::init() {
   cout << "TOI2Map::init" << endl;
-  declareInput("AlphaIn");     // input index 0
-  declareInput("DeltaIn");     // input index 1
+  declareInput("Coord1In");     // input index 0
+  declareInput("Coord2In");     // input index 1
   declareInput("BoloIn");      // input index 2
 }
@@ -58 +58 @@
 }
 if(!checkInputTOIIndex(0) || !checkInputTOIIndex(1) || !checkInputTOIIndex(2)) {
-  cout<<"TOI2Map::run() - Input TOI (AlphaIn or DeltaIn or BoloIn) not connected! "<<endl;
-  throw ParmError("TOI2Map::run() Output TOI (AlphaIn or DeltaIn or BoloIn) not connected!");
+  cout<<"TOI2Map::run() - Input TOI (Coord1In or Coord2In or BoloIn) not connected! "<<endl;
+  throw ParmError("TOI2Map::run() Output TOI (Coord1In or Coord2In or BoloIn) not connected!");
 }
 
@@ -75 +75 @@
   double bolo;
 
-  double alpha = getData(0,s); // alpha entre [0,24[ en heures
-  double delta = getData(1,s); // delta entre [-90,90] en degres
+  double coord1 = getData(0,s); // gLat ou delta entre [-90,90] en degres
+  double coord2 = getData(1,s); // gLon entre [0,360[ en degres ou alpha entre [0,24[ en heures
   getData(2,s,bolo,fgbolo);
 
-  if(delta<-90. || delta>90.)  fgbolo=1;
-  if(alpha<0.   || alpha>=24.) fgbolo=1;
+  if(coord2<-90. || coord2>90.) fgbolo=1; 
+  if((coord1<0.) || (!mTypCoor && coord1>=24.) || (mTypCoor && coord1>=360.) ) {fgbolo=1; 
+  cout << "!!!!!!!!" <<coord1 << endl;
+  }
+  
+  
+  
   if(bolo<-32767.) fgbolo=1;   // Bidouille Archeops
-
+  
   if(!fgbolo) {
+    // sphere phi entre [0,2*Pi] en radians
     // sphere phi entre [0,2*Pi] en radians
     // sphere theta entre [0,Pi] en radians
     double phi,theta;
-    if(mTypCoor) {
+    if(fTypCoor && !mTypCoor) { //on a alpha,delta et on veut l,b
       double mjd = MJDfrYear(mActualYear);
-      EqtoGal(mjd,alpha,delta,&alpha,&delta);
-      phi   = alpha * M_PI/180.;
-    } else phi = alpha * M_PI/12.;
-    theta = (90.-delta)*M_PI/180.;
+      EqtoGal(mjd,coord1,coord2,&coord1,&coord2);
+    } 
+
+    if(!fTypCoor && mTypCoor) { //on a l,b et on veut alpha,delta
+      double mjd = MJDfrYear(mActualYear);
+      GaltoEq(mjd,coord1,coord2,&coord1,&coord2);
+    }
+    
+    if(fTypCoor) phi = coord1 * M_PI/180.;
+    else  phi = coord1 * M_PI/12.;
+
+    theta = (90.-coord2)*M_PI/180.;
+
     int_4 ipix = mSph->PixIndexSph(theta,phi);
-    (*mSph)(ipix) += bolo;
+    (*mSph)(ipix) += bolo;    
     ((*mWSph)(ipix))++;
     mNSnFill++;

trunk/ArchTOIPipe/ProcWSophya/toi2map.h

@@ -15 +15 @@
 //                         |
 //                    -----------
-//   toi AlphaIn ---> |         |
-//   toi DeltaIn ---> | TOI2Map |
+//   toi Coord1In ---> |         |
+//   toi Coord2In ---> | TOI2Map |
 //   toi BoloIn  ---> |         |
 //                    -----------
@@ -27 +27 @@
   virtual void  init(void);  
   virtual void  run(void);
-  inline  void  SetCoorGal(bool fg=false,double actualyear=2000.)
-                          {mTypCoor = fg; mActualYear = actualyear;}
+  inline  void  SetCoorGal(bool mfg=false,bool ffg=false,double actualyear=2000.)
+                          {mTypCoor = mfg; fTypCoor = ffg; mActualYear = actualyear;}
   
 protected:
@@ -35 +35 @@
   bool mWSphInternal;
   bool mTypCoor;
+  bool fTypCoor;
   double mActualYear;
 };