Merge branch 'master' of gitlab.in2p3.fr:baoradio/AnaPAON4

trkfit.cc

@@ -572,7 +572,6 @@ int ACxSetFitter::doCxfit(string outfilenamecx, bool useAac)
 	gdata.AddData1(acxd_.v_time_data[j][k],v_cxdata[ii][k].imag(),v_cxerr[ii][k]); // Fill x, y and error on y     
       }
     }
-    cout << " *DBG* filled gdata " << endl;
     double clight = PhysQty::c().SIValue();
     double lambda = clight/(acxd_.v_freqs[0]*1.e6);
     ACBeam acb1(v_Ddish[Anum1[ii]], v_thetaant[Anum1[ii]], v_phiant[Anum1[ii]], lambda);
@@ -606,13 +605,13 @@ int ACxSetFitter::doCxfit(string outfilenamecx, bool useAac)
       v_amp[j]=A; 
     }
 
-    double fparm[50];  fparm[0]=0.;
+    double fparm[500];  fparm[0]=0.;
 
     double bestxi2 = 9.e19;
     double bestphase=0.;
     int bestnpts,npts;
     int bestafact;
-    double afact[10]={0.3,0.5,0.75,1.0,1.25,1.5,1.75,2.0,2.5,3.};
+    double afact[12]={0.15,0.3,0.5,0.75,1.0,1.25,1.5,1.75,2.0,2.4,2.8,3.2};
     for(int ia=0; ia<12; ia++) {
       for(size_t j=0; j<NTRK; j++) {
 	double Aac=sqrt(v_A[Anum1[ii]][j] * v_A[Anum2[ii]][j]);
@@ -633,7 +632,7 @@ int ACxSetFitter::doCxfit(string outfilenamecx, bool useAac)
     v_phase[ii]=bestphase;
     for(size_t j=0; j<NTRK; j++)  {
       cout << v_amp[j] << " , ";  
-      double Aac=sqrt(v_A[j][Anum1[ii]] * v_A[j][Anum2[ii]]);
+      double Aac=sqrt(v_A[Anum1[ii]][j] * v_A[Anum2[ii]][j]);
       v_Acx[ii][j]=(useAac?Aac:v_amp[j]);
     }
     cout << endl;