Changeset 1530 in Sophya for trunk/ArchTOIPipe

Timestamp:

Jun 14, 2001, 7:53:29 PM (24 years ago)

Author:

cmv

Message:

ameliorations et + de possibilites cmv 14/6/01

Location:

trunk/ArchTOIPipe

Files:

• ProcWSophya/map2toi.cc (modified) (1 diff)
• ProcWSophya/map2toi.h (modified) (1 diff)
• ProcWSophya/toi2map.cc (modified) (4 diffs)
• ProcWSophya/toi2map.h (modified) (3 diffs)
• TestPipes/tstmap2toi.cc (modified) (2 diffs)
• TestPipes/tsttoi2map.cc (modified) (9 diffs)

trunk/ArchTOIPipe/ProcWSophya/map2toi.cc

@@ -15 +15 @@
 Map2TOI::~Map2TOI()
 {
+}
+
+////////////////////////////////////////////////////////////////////////
+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;
 }
 

trunk/ArchTOIPipe/ProcWSophya/map2toi.h

@@ -42 +42 @@
   inline void SetCoorMap(TypAstroCoord mfg=TypCoordGalStd)
               {mTypCoorMap = mfg;}
+  // Print
+  void Print(ostream & os);
 
 protected:

trunk/ArchTOIPipe/ProcWSophya/toi2map.cc

@@ -12 +12 @@
  SetCoorIn();
  SetCoorOut();
+ SetTestFlag();
+ SetTestMin();
+ SetTestMax();
 
  if(mSph->NbPixels()<1) {
@@ -40 +43 @@
 {
  if(mWSph && !mWSphInternal) delete mWSph;
+}
+
+////////////////////////////////////////////////////////////////////////
+void TOI2Map::Print(ostream & os)
+{
+  os<<"TOI2Map::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
+
+    <<"   - TypCoorOut: Gal("<<((mTypCoorOut&TypCoordGal)?1:0)
+    <<") Eq("<<((mTypCoorOut&TypCoordEq)?1:0)
+    <<") Deg("<<((mTypCoorOut&TypCoordDD)?1:0)
+    <<") Hour("<<((mTypCoorOut&TypCoordHD)?1:0)
+    <<") Rad("<<((mTypCoorOut&TypCoordRR)?1:0)<<")"<<endl
+
+    <<"   - Tests: Flag("<<mTFlag<<") bad="<<mBadFlag
+    <<" / Value Min("<<mTMin<<")="<<mValMin
+    <<" , Max("<<mTMax<<")="<<mValMax<<endl;
 }
 
@@ -92 +119 @@
 
   getData(2,s,bolo,fgbolo);
-  if(bolo<-32767.) continue; // Bidouille (A CORRIGER QUAND FGBOLO DISPO)
+  if(mTFlag && fgbolo&mBadFlag) continue;
+  if(mTMin && bolo<mValMin) continue;
+  if(mTMax && bolo>mValMax) continue;
 
   // sphere phi   entre [0,2*Pi] en radians
@@ -115 +144 @@
   int_4 ipix = mSph->PixIndexSph(theta,phi);
   (*mSph)(ipix) += bolo;    
-  ((*mWSph)(ipix))++;
+  ((*mWSph)(ipix)) += 1;
   mNSnFill++;
 }

trunk/ArchTOIPipe/ProcWSophya/toi2map.h

@@ -3 +3 @@
 #define TOI2MAP_H
 
+#include "toiprocessor.h"
 #include "toiprocessor.h"
 #include "spherehealpix.h"
@@ -41 +42 @@
   inline void SetCoorOut(TypAstroCoord mfg=TypCoordGalStd)
               {mTypCoorOut = mfg;}
+  // Test on flag value ? if yes, BAD sample have flag matching mBadFlag
+  inline void SetTestFlag(bool tflg=false, int_8 badflg=0)
+              {mTFlag = tflg; mBadFlag = badflg;}
+  // Test on min value ? if yes, GOOD sample have value >= mValMin
+  // Test on max value ? if yes, GOOD sample have value <= mValMax
+  // Good values are (mValMin <= sample value <= mValMax)
+  //                      bounds are included
+  inline void SetTestMin(bool tmin=false, r_8 vmin=-1.e30)
+              {mTMin = tmin; mValMin = vmin;}
+  inline void SetTestMax(bool tmax=false, r_8 vmax=+1.e30)
+              {mTMax = tmax; mValMax = vmax;}
+  // Print
+  void Print(ostream & os);
 
 protected:
@@ -46 +60 @@
   SphereHEALPix<r_8>* mWSph;
   bool mWSphInternal;
+
   TypAstroCoord mTypCoorIn, mTypCoorOut;
   double mActualYear;
+
+  bool mTFlag,mTMin,mTMax;
+  int_8 mBadFlag;
+  r_8 mValMin,mValMax;
 };
 

trunk/ArchTOIPipe/TestPipes/tstmap2toi.cc

@@ -137 +137 @@
 
  FITSTOIWriter wfits(fitsout);
- wfits.setOutFlags(true);
+ //wfits.setOutFlags(true);
  cout << "fits reader and writer created"<<endl;
 
@@ -153 +153 @@
  m2toi.SetCoorIn((TypAstroCoord) tcoorin);
  m2toi.SetCoorMap((TypAstroCoord) tcoormap);
+ m2toi.Print(cout);
 
  // Definition des tuyaux

trunk/ArchTOIPipe/TestPipes/tsttoi2map.cc

@@ -20 +20 @@
      <<"           [-a label_coord1] [-d label_coord2] [-b label_bolomuv]"<<endl
      <<"           [-n nlat] [-i c,h] [-o c,h]"<<endl
+     <<"           [-m vmin] [-M vmax] [-f flag]"<<endl
      <<"           fitsin_point fitsin_bolo fitsphout [fitsphwout]"<<endl
      <<" -p lp : print level (def=0)"<<endl
@@ -29 +30 @@
      <<" -b label_bolomuv : label fits for bolo value (def=boloMuV)"<<endl
      <<" -n nlat : nlat for Healpix sphere (def=128)"<<endl
-     <<" -i c,h : coordIn caracteristics (c=G/E h=H/D) (def=G,D)"<<endl
+     <<" -i c,h : coordIn caracteristics (c=G/E h=H/D/R) (def=G,D)"<<endl
      <<" -o c,h : idem -i for coordOut"<<endl
+     <<" -m vmin : samples are good if sample value >= vmin"<<endl
+     <<" -M vmax : samples are good if sample value <= vmax"<<endl
+     <<" -f flag : samples are bad if match flag"<<endl
      <<" fitsin_point : fits file for pointing"<<endl
      <<" fitsin_bolo : fits file for bolo values"<<endl
@@ -40 +44 @@
 unsigned long typecoord(char typc,char hd)
 // typc : G=galactiques, E=equatoriales, autres=galactiques
-// hd : H=heure, D=degre, autres=(heure si typc==E, degre si typc==G)
+// hd : H=heure, D=degre, R=radian, autres=(heure si typc==E, degre si typc==G)
 {
   if(typc!='G' && typc!='E') typc='G';
-  if(hd!='H' && hd!='D') {if(typc=='E') hd='H'; else hd='D';}
+  if(hd!='H' && hd!='D' && hd!='R') {if(typc=='E') hd='H'; else hd='D';}
  unsigned long rc=TypCoordUndef;
   if(typc=='G') rc |= TypCoordGal;
     else        rc |= TypCoordEq;
-  if(hd=='D')   rc |= TypCoordDD;
-    else        rc |= TypCoordHD;
+  if(hd=='D')        rc |= TypCoordDD;
+    else if(hd=='R') rc |= TypCoordRR;
+      else           rc |= TypCoordHD;
   return rc;
 }
@@ -60 +65 @@
 int lp = 0, width = 8192;
 int nlat = 128;   // npixel = 12 * nlat^2
-char *label_coord1 = "coord1", *label_coord2 = "coord2", *label_bolomuv = "boloMuV";
+bool tflg=false, tmin=false, tmax=false;
+r_8 vmin=-1.e30, vmax=1.e30; int_8 badflg=0;
+char *label_coord1 = "coord1", *label_coord2 = "coord2"
+   , *label_bolomuv = "boloMuV";
 long sdeb,sfin;
 string fitsphwout = "";
 unsigned long tcoorin=typecoord(), tcoorout=typecoord();
 int c; char t=' ',h=' ';
-while((c = getopt(narg,arg,"hp:s:w:a:d:b:n:i:o:")) != -1) {
+while((c = getopt(narg,arg,"hp:s:w:a:d:b:n:i:o:m:M:f:")) != -1) {
   switch (c) {
   case 's' :
@@ -103 +111 @@
     tcoorout=typecoord(t,h);
     break;
+  case 'm' :
+    sscanf(optarg,"%lf",&vmin);
+    tmin = true;
+    break;
+  case 'M' :
+    sscanf(optarg,"%lf",&vmax);
+    tmax = true;
+    break;
+  case 'f' :
+    sscanf(optarg,"%ld",&badflg);
+    tflg = true;
+    break;
   case 'h' :
   default:
@@ -116 +136 @@
 if(optind+3<narg) fitsphwout = arg[optind+3];
 
-{
-unsigned long tg,te,hd,dd;
 cout<<">>>> tsttoi2map:"<<endl
     <<"Pipe Window Size "<<width<<endl
     <<"Fits Infile Bolo "<<fitsin_bolo<<endl
     <<"  ...label_bolomuv "<<label_bolomuv<<endl;
-tg = tcoorin&TypCoordGal; te = tcoorin&TypCoordEq;
-hd = tcoorin&TypCoordHD;  dd = tcoorin&TypCoordDD;
 cout<<"Fits Infile Pointing "<<fitsin_point<<endl
     <<"  ...label_coord1 "<<label_coord1<<endl
-    <<"  ...label_coord2 "<<label_coord2<<endl
-    <<"  ...... Gal="<<tg<<" Eq="<<te<<"   hour="<<hd<<" deg="<<dd<<endl;
-tg = tcoorout&TypCoordGal; te = tcoorout&TypCoordEq;
-hd = tcoorout&TypCoordHD;  dd = tcoorout&TypCoordDD; 
+    <<"  ...label_coord2 "<<label_coord2<<endl;
 cout<<"Fits Healpix Sphere "<<fitsphout<<endl
-    <<"  ...nlat "<<nlat<<endl
-    <<"  ...... Gal="<<tg<<" Eq="<<te<<"   hour="<<hd<<" deg="<<dd<<endl;
+    <<"  ...nlat "<<nlat<<endl;
 cout<<"Fits Healpix Weight Sphere "<<fitsphwout<<endl;
-}
 
 SophyaInit();
@@ -157 +168 @@
  SphereHEALPix<r_8>* sph = new SphereHEALPix<r_8>(nlat);
  cout<<"SphereHEALPix: Type de map : "<<sph->TypeOfMap()<<endl
-     <<"               Nombre de pixels : "<<sph->NbPixels()<<endl;
+     <<"               Nombre de pixels : "<<sph->NbPixels()<<endl
+     <<"               Nlat : "<<sph->SizeIndex()<<endl;
 
  // Creation de la sphere de poids Healpix
@@ -163 +175 @@
  if(fitsphwout.size()>0) {
    wsph = new SphereHEALPix<r_8>;
-   cout<<"SphereHEALPix Weight: Type de map : "<<wsph->TypeOfMap()<<endl
-       <<"              Nombre de pixels : "<<wsph->NbPixels()<<endl;
+   cout<<"SphereHEALPix Weight Created"<<endl;
  }
 
@@ -173 +184 @@
  toi2m.SetCoorIn((TypAstroCoord) tcoorin);
  toi2m.SetCoorOut((TypAstroCoord) tcoorout);
+ toi2m.SetTestFlag(tflg,badflg);
+ toi2m.SetTestMin(tmin,vmin);
+ toi2m.SetTestMax(tmax,vmax);
+ toi2m.Print(cout);
 
  // Definition des tuyaux