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

 Encore une modif sur trkfit.cc avec le repository modifie sur d'autres fichiers ... Reza

TrackingSrc/altaz/altaz.py

@@ -130,17 +130,18 @@ def write_survey(local_lat,
     else:
         fname = f'{source}_survey.txt'
 
-    print(f'{"Save tracking on file {fname}"}')
+    print("Save tracking on file {}".format(fname))
     file = open(fname, "w")
 
     file.write("#### Track for {}\n".format(source))
     file.write("#### Observer lat:{} long:{}\n".format(local_lat,local_lon))
     file.write("#### Use Galactic coordinate (l,b)\n")
-    file.write("#### %Y-%m-%d %H:%M:%S.%f Az(deg_dec) Alt(deg_dec) Range l(deg_dec) b(deg_dec) Altitude\n")
+    file.write("#### %Y-%m-%d %H:%M:%S.%f UTC Az(deg_dec) Alt(deg_dec) Range l(deg_dec) b(deg_dec) Altitude\n")
 
     for i in survey:
         long_lat_galactic = i.galactic
         file.write(Time.strftime(i.obstime,'%Y-%m-%d %H:%M:%S.%f')
+            +" UTC "
             +f'{Angle(i.az).degree:10.4f}'
             +f'{Angle(i.alt).degree:10.4f}'
             +f'{1.e19:10.2E}'

TrackingSrc/altaz/tracksrc.sh

+python altaz.py -src CasA -t0 "2019-1-14 15:39:00" -tag "_2019-1-14"
+python altaz.py -src CasA -t0 "2019-1-15 15:35:00" -tag "_2019-1-15"
+python altaz.py -src CasA -t0 "2019-1-16 15:31:00" -tag "_2019-1-16"
+
+python altaz.py -src CygA -t0 "2019-1-17 12:04:00" -tag "_2019-1-17"
+python altaz.py -src CygA -t0 "2019-1-18 12:00:00" -tag "_2019-1-18"
+
+python altaz.py -src M1 -t0 "2019-1-19 21:30:00" -tag "_2019-1-19"
+python altaz.py -src M1 -t0 "2019-1-20 21:26:00" -tag "_2019-1-20"
+
+python altaz.py -src M37 -t0 "2019-1-21 4:21:00" -tag "_2019-1-21"
+python altaz.py -src M37 -t0 "2019-1-22 4:17:00" -tag "_2019-1-22"
+python altaz.py -src M37 -t0 "2019-1-23 4:13:00" -tag "_2019-1-23"
+
+python altaz.py -src  J04310377+2037346 -t0 "2019-1-19 21:30:00" -tag "_2019-1-19"
+python altaz.py -src  J04310377+2037346 -t0 "2019-1-20 21:26:00" -tag "_2019-1-20"
+
+python altaz.py -src moon -t0 "2019-1-14 00:00:00" -dt 240 -type range -tag "_2019-1-14"
+python altaz.py -src sun -t0 "2019-1-14 00:00:00" -dt 240 -type range -tag "_2019-1-14"
+

trkfit.cc

@@ -586,7 +586,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);
@@ -620,13 +619,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]);
@@ -647,7 +646,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;