Changeset 1809 in Sophya for trunk/ArchTOIPipe/TestPipes

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

Location:

trunk/ArchTOIPipe/TestPipes

Files:

• tstmap2toi.cc (modified) (8 diffs)
• tsttoi2map.cc (modified) (6 diffs)

trunk/ArchTOIPipe/TestPipes/tstmap2toi.cc

@@ -19 +19 @@
 
 #include <stdexcept>
-
 
 void usage(void);
@@ -34 +33 @@
      <<"          coord1 = alpha or gLong ; coord2 = delta or gLat"<<endl
      <<" -b label_bolomuv : label fits for bolo value (def=boloMuV)"<<endl
-     <<" -i c,h : coordIn caracteristics (c=G/E h=H/D) (def=G,D)"<<endl
-     <<" -m c,h : idem -i for Sphere"<<endl
+     <<" -i cin : coordIn caracteristics (def=\"gdcdl\")"<<endl
+     <<" -m cmap : idem -i for Sphere (def=\"g\")"<<endl
+     <<" -e equi : equinoxe en annee (def=2000.)"<<endl
      <<" fitsin_point : fits file for pointing"<<endl
      <<" fitsphere : fits file for input Healpix sphere"<<endl
@@ -42 +42 @@
 }
 
-unsigned long typecoord(char typc=' ',char hd=' ');
-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)
-{
-  if(typc!='G' && typc!='E') typc='G';
-  if(hd!='H' && hd!='D') {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;
-  return rc;
-}
-
 ////////////////////////////////////////////////////////////////
 int main(int narg, char** arg) {
@@ -65 +50 @@
 int lp = 0, width = 8192;
 char *label_coord1 = "coord1", *label_coord2 = "coord2", *label_bolomuv = "boloMuV";
+char *tcoorin="gdcdl", *tcoormap="g";
+double equi=2000.;
 long sdeb,sfin;
-unsigned long tcoorin=typecoord(), tcoormap=typecoord();
-int c; char t=' ',h=' ';
-while((c = getopt(narg,arg,"hp:s:w:a:d:b:i:m:")) != -1) {
+int c;
+while((c = getopt(narg,arg,"hp:s:w:a:d:b:i:m:e:")) != -1) {
   switch (c) {
   case 's' :
@@ -95 +81 @@
     break;
   case 'i' :
-    sscanf(optarg,"%c,%c",&t,&h);
-    tcoorin=typecoord(t,h);
+    tcoorin = optarg;
     break;
   case 'm' :
-    sscanf(optarg,"%c,%c",&t,&h);
-    tcoormap=typecoord(t,h);
+    tcoormap = optarg;
+    break;
+  case 'e' :
+    sscanf(optarg,"%lf",&equi);
     break;
   case 'h' :
@@ -112 +99 @@
 char * fitsout         = arg[optind+2];
 
-{
-unsigned long tg,te,hd,dd;
 cout<<">>>> tstmap2toi:"<<endl
     <<"Pipe Window Size "<<width<<endl
     <<"Fits OutFile "<<fitsout<<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 = tcoormap&TypCoordGal; te = tcoormap&TypCoordEq;
-hd = tcoormap&TypCoordHD;  dd = tcoormap&TypCoordDD; 
+    <<"  ...... ctype="<<tcoorin<<endl;
 cout<<"Fits Healpix Sphere "<<fitsphere<<endl
-    <<"  ...... Gal="<<tg<<" Eq="<<te<<"   hour="<<hd<<" deg="<<dd<<endl;
-}
+    <<"  ...... ctype="<<tcoormap<<endl;
+cout<<"Equinoxe "<<equi<<" years"<<endl;
 
 SophyaInit();
@@ -157 +138 @@
  Map2TOI m2toi(sph);
  cout<<"Map2TOI created"<<endl;
- m2toi.SetEquinox(2000.);
- m2toi.SetCoorIn((TypAstroCoord) tcoorin);
- m2toi.SetCoorMap((TypAstroCoord) tcoormap);
+ m2toi.SetEquinox(equi);
+ m2toi.SetCoorIn(tcoorin);
+ m2toi.SetCoorMap(tcoormap);
  m2toi.Print(cout);
 
@@ -219 +200 @@
  wfits.start();
 
- if(lp>1)
-   for(int jjjj=0;jjjj<5;jjjj++) {
-     cout<<*toicoord1in; 
-     cout<<*toibolout; 
-     sleep(2);
-   }
+ //if(lp>1) for(int jjjj=0;jjjj<5;jjjj++) {
+ //  cout<<*toicoord1in; 
+ //  cout<<*toibolout; 
+ //  sleep(2);
+ //}
 
  //  Affichage de l'avancement des TOIProcessors 

trunk/ArchTOIPipe/TestPipes/tsttoi2map.cc

@@ -37 +37 @@
      <<" -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/R) (def=G,D)"<<endl
-     <<" -o c,h : idem -i for coordOut"<<endl
+     <<" -i cin : coordIn caracteristics (def=\"gdcdl\")"<<endl
+     <<" -o cmap : idem -i for coordMap (def=\"g\")"<<endl
+     <<" -e equi : equinoxe en annee (def=2000.)"<<endl
      <<" -m vmin : samples are good if sample value >= vmin"<<endl
      <<" -M vmax : samples are good if sample value <= vmax"<<endl
@@ -48 +49 @@
 }
 
-unsigned long typecoord(char typc=' ',char hd=' ');
-unsigned long typecoord(char typc,char hd)
-// typc : G=galactiques, E=equatoriales, autres=galactiques
-// 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' && 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 if(hd=='R') rc |= TypCoordRR;
-      else           rc |= TypCoordHD;
-  return rc;
-}
-
 ////////////////////////////////////////////////////////////////
 int main(int narg, char** arg) {
@@ -76 +61 @@
 char *label_coord1 = "coord1", *label_coord2 = "coord2"
    , *label_bolomuv = "boloMuV";
+double equi=2000.;
+char *tcoorin="gdcdl", *tcoormap="g";
+string fitsphwout = "";
 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:m:M:f:")) != -1) {
+int c;
+while((c = getopt(narg,arg,"hp:s:w:a:d:b:n:i:o:m:M:f:e:")) != -1) {
   switch (c) {
   case 's' :
@@ -111 +97 @@
     break;
   case 'i' :
-    sscanf(optarg,"%c,%c",&t,&h);
-    tcoorin=typecoord(t,h);
+    tcoorin=optarg;
     break;
   case 'o' :
-    sscanf(optarg,"%c,%c",&t,&h);
-    tcoorout=typecoord(t,h);
+    tcoormap=optarg;
+    break;
+  case 'e' :
+    sscanf(optarg,"%lf",&equi);
     break;
   case 'm' :
@@ -149 +136 @@
 cout<<"Fits Infile Pointing "<<fitsin_point<<endl
     <<"  ...label_coord1 "<<label_coord1<<endl
-    <<"  ...label_coord2 "<<label_coord2<<endl;
+    <<"  ...label_coord2 "<<label_coord2<<endl
+    <<"  ...... ctype="<<tcoorin<<endl;
 cout<<"Fits Healpix Sphere "<<fitsphout<<endl
     <<"  ...nlat "<<nlat<<endl;
-cout<<"Fits Healpix Weight Sphere "<<fitsphwout<<endl;
+cout<<"Fits Healpix Weight Sphere "<<fitsphwout<<endl
+    <<"  ...... ctype="<<tcoormap<<endl;
+cout<<"Equinoxe "<<equi<<" years"<<endl;
 
 SophyaInit();
@@ -189 +179 @@
  TOI2Map toi2m(sph,wsph);
  cout<<"TOI2Map created"<<endl;
- toi2m.SetEquinox(2000.);
- toi2m.SetCoorIn((TypAstroCoord) tcoorin);
- toi2m.SetCoorOut((TypAstroCoord) tcoorout);
+ toi2m.SetEquinox(equi);
+ toi2m.SetCoorIn(tcoorin);
+ toi2m.SetCoorMap(tcoormap);
  toi2m.SetTestFlag(tflg,badflg);
  toi2m.SetTestMin(tmin,vmin);