Changeset 1626 in Sophya for trunk/SophyaProg/PrgMap/cremskfrsph.cc

Timestamp:

Aug 7, 2001, 6:20:32 PM (24 years ago)

Author:

cmv

Message:

Uniformisation des programmes + doc cmv 7/8/01

File:

• trunk/SophyaProg/PrgMap/cremskfrsph.cc (modified) (6 diffs)

trunk/SophyaProg/PrgMap/cremskfrsph.cc

@@ -13 +13 @@
 #include "fitsspherehealpix.h" 
 
+/*!
+  \ingroup PrgMap
+  \file cremskfrsph.cc
+  \brief \b cremskfrsph: Create a masked sphere from a sphere of datas
+  \verbatim
+csh> cremskfrsph -h
+cremskfrsph [-n -m min -M max -v valmsk,inimsk] sphval.fits sphmask.fits
+ -m min : min value
+ -M max : max value
+    condition for filling masque is: min<=sphere_value<=max
+          (fill mask with valmsk)     (bounds are included)
+ -n : negate the condition
+      (switch to: sphere_value<min || max<sphere_value)
+ -v valmsk,inimsk:
+    valmsk: value to be put into mask if ok (def=1.)
+    inimsk: initialisation value for the mask (def=0.)
+  \endverbatim
+*/
+
 void usage();
 void usage()
@@ -19 +38 @@
     <<" -m min : min value"<<endl
     <<" -M max : max value"<<endl
-    <<"    condition for filling masque is : min<=sphere value<=max"<<endl
-    <<"                                      (bounds are included)"<<endl
+    <<"    condition for filling masque is: min<=sphere_value<=max"<<endl
+    <<"          (fill mask with valmsk)     (bounds are included)"<<endl
     <<" -n : negate the condition"<<endl
+    <<"      (switch to: sphere_value<min || max<sphere_value)"<<endl
     <<" -v valmsk,inimsk:"<<endl
     <<"    valmsk: value to be put into mask if ok (def=1.)"<<endl
@@ -32 +52 @@
 double vmin=-1.e30,vmax=1.e30,vmask=1.,vmaskini=0.;
 bool tstmin=false,tstmax=false,negate=false;
+string dum;
 int c;
 while((c = getopt(narg,arg,"hnm:M:v:")) != -1) {
@@ -59 +80 @@
 char * sphmsk = arg[optind+1];
 
+if(negate) dum = ".NOT."; else dum = "";
 cout<<"Sphere values : "<<sphval<<endl
     <<"Sphere mask   : "<<sphmsk<<endl
-    <<"  ...min("<<tstmin<<") "<<vmin<<"  max("<<tstmax<<") "<<vmax<<endl
+    <<"  ...min("<<tstmin<<") "<<vmin<<endl
+    <<"     max("<<tstmax<<") "<<vmax<<endl
     <<"  ...negate "<<negate<<endl
     <<"  ...mask set value "<<vmask<<endl
-    <<"     mask init value "<<vmaskini<<endl;
-cout<<"Condition : ";
-if(negate) cout<<"!";
-cout<<"( "<<vmin<<" <= V <= "<<vmax<<" ) bounds are included"<<endl;
+    <<"     mask init value "<<vmaskini<<endl
+    <<"Condition on data to set the mask: "
+    <<dum<<"( "<<vmin<<" <= V <= "<<vmax<<" )"<<endl;
 
 // Lecture de la sphere Healpix des valeurs
-SphereHEALPix<r_8> sph;        
+SphereHEALPix<r_8> sph;
 FitsInFile sfits(sphval);
 sfits >> sph;
@@ -87 +109 @@
 for(int_4 i=0;i<sph.NbPixels();i++) {
   sphm(i) = vmaskini;
-  r_8 v = sph(i);
-  bool intoint = true;
-  if(tstmin && v<vmin) intoint=false;
-  if(tstmax && v>vmax) intoint=false;
-  //                    [vmin , vmax]
-  // intoint :   false  [    true   ]  false  (si tstmin && tstmax)
-  // intoint :   false  [    true             (si tstmin && !tstmax)
-  // intoint :               true   ]  false  (si !tstmin && tstmax)
-  if(negate && intoint) continue;
-  else if(!negate && !intoint) continue;
+
+  bool skp = (tstmin || tstmax) ? negate : false;
+  if((tstmin && sph(i)<vmin) || (tstmax && sph(i)>vmax)) skp = !negate;
+  if(skp) continue;   // Do nothing
+
   sphm(i) = vmask;
   nmask++;
@@ -106 +123 @@
 // Ecriture de la sphere Healpix sur fits
 {
-string dum = "rm -f "; dum += sphmsk; system(dum.c_str());
+dum = "rm -f "; dum += sphmsk; system(dum.c_str());
 FitsOutFile swfits(sphmsk);
 cout<<"Writing Mask Sphere Fits file"<<endl;