Changeset 189 in Sophya for trunk/SophyaPI/PIext

Timestamp:

Jan 18, 1999, 7:33:42 PM (27 years ago)

Author:

ercodmgr

Message:

photom circ. dans photom_ouv (cmv 18/1/99)

File:

• trunk/SophyaPI/PIext/piacmd.cc (modified) (7 diffs)

trunk/SophyaPI/PIext/piacmd.cc

@@ -575 +575 @@
 else if (kw == "aper" ) {
   if (tokens.size() < 1) { 
-    cout << "PIACmd::Do() Usage: aper fond_typ [options_calcul]" << endl;
+    cout << "PIACmd::Do() Usage: aper fond_typ [opt_calcul opt_disp]" << endl;
     return(0);
     }
@@ -876 +876 @@
 //|   : faa.bbb = fond fixe a aa.bbb
 //|   defaut : "b"
-//| tokens[1] = options pour le fit ex: l1.0
+//| tokens[1] = options pour le fit ex: l1
 //|      : ra = "a" rayon minimal de scan (def=0)
 //|      : ga = "a" taille de la fenetre glissante pour les extrapolations (def=4)
 //|      : la = "a" niveau de print
+//|      : c  = la surface pour la photometrie est un carre (defaut=cercle)
 //| tokens[2] = options graphiques
 //| Return: 0 si Ok, <0 sinon.
@@ -887 +888 @@
 int typ_fond=1, rmin=0, rmax, npt_gliss=4, lp=0;
 float fondimpos=0., fondbord=0., fondautre;
+bool cercle = true;
 string opt="";
 string dummy; string dum;
@@ -896 +898 @@
     size_t p = dummy.find(",r"); size_t q = dummy.find_first_of(',',p+1);
     dum = dummy.substr(p,q-p);
-    if(dum.length()>2) sscanf(dum.c_str(),",r%d",&lp);
+    if(dum.length()>2) sscanf(dum.c_str(),",r%d",&rmin);
   }
   if(strstr(dummy.c_str(),",g")) {
@@ -907 +909 @@
     dum = dummy.substr(p,q-p);
     if(dum.length()>2) sscanf(dum.c_str(),",l%d",&lp);
+  }
+  if(strstr(dummy.c_str(),",c")) {
+    cercle = false;
   }
 }
@@ -958 +963 @@
 // Print
 if(lp>1)
-  cout<<"photom_ouv[typ="<<typ_fond<<"]: pav["<<dx<<","<<dy<<" ("<<dxym
+  cout<<"photom_ouv[cercle="<<cercle<<",typ="<<typ_fond<<"]: pav["
+      <<dx<<","<<dy<<" ("<<dxym
       <<"] xc,yc="<<xc<<","<<yc<<"] ic,jc="<<ic<<","<<jc<<endl
       <<"] (fond="<<fondimpos<<") pxmil="<<(*pav)(ic,ic)
@@ -985 +991 @@
   double sum=0.; int ns=0, nf=0;
   for(int i=0;i<dxym;i++) for(int j=0;j<dxym;j++) {
-    if(ic-r<=i && i<=ic+r && jc-r<=j && j<=jc+r ) {sum += (*pav)(i,j); ns++;}
+    double ray2 = (i-ic)*(i-ic)+(j-jc)*(j-jc)-0.1;
+    if( (cercle && ray2<=r*r) ||
+        (!cercle && ic-r<=i && i<=ic+r && jc-r<=j && j<=jc+r) )
+          {sum += (*pav)(i,j); ns++;}
     else {p[nf] = (*pav)(i,j); nf++;}
   }