Suite Debug (encore !) impression summary des fits , Reza 04/04/2019

trkfit.cc

@@ -320,10 +320,10 @@ ostream & AcxDataSet::PrintACFitSummary(ostream & os)
     double azimdeg=90.-Angle(phiant).ToDegree();
     if (azimdeg<0.)  azimdeg += 360.;
     double err_azimdeg=Angle(err_phiant).ToDegree();
-    os<<acnames[i]<<" D= "<<setw(6)<<v_Ddish[i]<<" +/- "<<setw(6)<<v_err_Ddish[i];
+    os<<acnames[i]<<" D(m)= "<<setw(6)<<v_Ddish[i]<<" +/- "<<setw(6)<<v_err_Ddish[i];
     os<<" Elev(deg)= "<<setw(8)<<elevdeg<<" +/- "<<setw(8)<<err_elevdeg;
     os<<" Azim(deg)= "<<setw(8)<<azimdeg<<" +/- "<<setw(8)<<err_azimdeg;
-    os<<" RcFit="<<setw(6)<<v_RcFit_ac[i]<<" Xi2Red="<<setw(8)<<v_xi2red_ac[i]<<endl;
+    os<<"  RcFit="<<setw(6)<<v_RcFit_ac[i]<<" Xi2Red="<<setw(8)<<v_xi2red_ac[i]<<endl;
   }
   return os;
 }
@@ -340,11 +340,11 @@ ostream & AcxDataSet::PrintCxPhaseFitSummary(ostream & os)
   os<<" Cx-2x3: Phi3-Phi2= "<<setw(6)<<Angle(dphi23).ToDegree()<<" EqualTo? Phi23= "<<setw(6)<<Angle(v_phase[3]).ToDegree()<<endl;
   os<<" Cx-2x4: Phi4-Phi2= "<<setw(6)<<Angle(dphi24).ToDegree()<<" EqualTo? Phi24= "<<setw(6)<<Angle(v_phase[4]).ToDegree()<<endl;
   os<<" Cx-3x4: Phi4-Phi3= "<<setw(6)<<Angle(dphi34).ToDegree()<<" EqualTo? Phi34= "<<setw(6)<<Angle(v_phase[5]).ToDegree()<<endl;
-  os << "--------- Cx-Fitted Parameters and errors ( Phi(freq)=phi0+a_phi*(freq-1250.)/250. "<<endl;
+  os << "--------- Cx-Fitted Phase(freq) parameters and errors  Phi(freq)=phi0+a_phi*(freq-1250.)/250. "<<endl;
   for(size_t i=0; i<getNbCrossCor(); i++) {
     os<<cxnames[i]<<" phi0= "<<setw(8)<<Angle(v_phi_0[i]).ToDegree()<<" +/- "<<setw(8)<<Angle(v_err_phi_0[i]).ToDegree()
       <<" a_phi= "<<setw(8)<<Angle(v_a_phi[i]).ToDegree()<<" +/- "<<setw(8)<<Angle(v_err_a_phi[i]).ToDegree()
-      <<" RcFit="<<setw(6)<<v_RcFit_cx[i]<<" Xi2Red="<<setw(8)<<v_xi2red_cx[i]<<endl;
+      <<"  RcFit="<<setw(6)<<v_RcFit_cx[i]<<" Xi2Red="<<setw(8)<<v_xi2red_cx[i]<<endl;
   }
   return os;
 }
@@ -575,6 +575,7 @@ int ACxSetFitter::doACfit(string outfilename)
     v_err_Ddish[ii]=err_Dfit;
     double thetaant=mFit.GetParm(1);   double err_thetaant=mFit.GetParmErr(1);
     v_thetaant[ii]=thetaant;
+    v_err_thetaant[ii]=err_thetaant;
     double elevdeg=90.-Angle(thetaant).ToDegree();
     double err_elevdeg=Angle(err_thetaant).ToDegree();
     cout <<setw(16)<<"ThetaAntenne= "<<setw(12)<<Angle(thetaant).ToDegree()<< " +/- "
@@ -586,6 +587,7 @@ int ACxSetFitter::doACfit(string outfilename)
     if (azimdeg<0.)  azimdeg += 360.;
     double err_azimdeg=Angle(err_phiant).ToDegree();
     v_phiant[ii]=phiant;
+    v_err_phiant[ii]=err_phiant;
     cout <<setw(16)<<"PhiAntenne= "<<setw(12)<<Angle(phiant).ToDegree()<< " +/- "
 	 <<setw(12)<<Angle(err_phiant).ToDegree()<<" (azimuth  ="
 	 <<setw(8)<<azimdeg<<" +/- "<<setw(8)<<err_azimdeg<<" ) deg."<<endl;
@@ -620,7 +622,7 @@ int ACxSetFitter::doACfit(string outfilename)
   acxd_.v_xi2red_ac=v_xi2red_ac;
   acxd_.v_Ddish=v_Ddish;
   acxd_.v_thetaant=v_thetaant;
-  acxd_.v_thetaant=v_thetaant;
+  acxd_.v_phiant=v_phiant;
   acxd_.v_err_Ddish=v_err_Ddish;
   acxd_.v_err_thetaant=v_err_thetaant;
   acxd_.v_err_phiant=v_err_phiant;