MAJ makefile (target depend), README , Reza 23/10/2017

README

 -------------------------------------------------------------------
   PAON-4 visibility analysis programs 
-       R. Ansari, J.E. Campagne, C. Magneville   -  Feb 2015
-                                                    Updated Feb 2017 
+       R. Ansari, J.E. Campagne, C. Magneville , O. Perdereau
+  LAL/CNRS-IN2P3, Univ. Paris-Sud , Irfu/CEA        2015-2017 
  -------------------------------------------------------------------
 
+-------------------------------------------
+                   CONTENT 
+-------------------------------------------
 
+o Scripts/ : Directory for display scripts ( Check p4quicklook.pic ) 
 
-List of files:
-- makefile 
-- visip4reader.h .cc   a class to read sequentially the visibility files 
-  produced by mfac, merge the different frequency bands and set of visibilities 
-  and reorder frequencies 
+o Source (c++) files and associated makefile 
+
+- visip4reader.h .cc : class to read visibility files produced by TAcq/mfacq.cc, 
+  merge the different frequency bands and set of visibilities and reorder frequencies 
   Updated  July 2016: added the possibility to read the mean FFT coeff matrix computed
 	during visibility computation	
+  Updated  Sep/Oct 2017 : extensive redesign, introduction of the following class hierarchy  
+     VisiP4ReaderBase ---- VisiP4ReaderNoDB 
+                      ---- VisiP4ReaderDB   
+  to read observations saved by  VisMtxDBWriter class in TAcq/ + new services
+
+- p4autils.h p4autils.cc : utility classes and functions, in particular argument decoder class
+    for different programs :
+    class : P4FreqBand , P4AVisiNumEncoder , P4AnaParams , P4Coords
+
+- p4gnugain.h p4gnugain.cc : gain computation and correction classes P4gnuGain
+
 - rdvisip4.cc : a simple main program to read visibilitiy files and produce a single 
   mean visibility matrix 
     Updated April 2015: computes also a frequency dependent gain gain(nu) using a gain 
     function developed by Christophe (cmv) for cluster data analysis 
     Updated July 2016: use -m option to read the mean FFT coef matrix
+    Updated October 2016: can read also Cross-Freq spectra 
+
+- visiavg.cc : main program to read observations and produce Time-Frequency maps for 
+  auto-correlations, H-H cross-correlations and variances 
 
-- p4autils.h p4autils.cc : utility classes and functions, in particular argument decoder class
-    for different programs 
-    
 - visi2dtacx.cc : a main program to read visibilitiy files and produce a datatable 
   with auto-correlation and 6 cross correlations (1H-2H 1H-3H 1H-4H 2H-3H 2H-4H 3H-4H) 
   as a function of time for three frequency bins - Can also make a time-frequency map of 
@@ -40,3 +55,61 @@ and vismtxII.ppf files ( 4 feeds) to create datatable and time-frequency maps
   with total power as a function of time for the 8 PAON4 auto-correlations 
     Updated April 2015: reads the gain g(nu) file produced by rdvisip4.cc , corrects the 
     auto-correlation signals before integrating in the specified bands 
+
+-------------------------------------------
+                    Usage 
+-------------------------------------------
+
+o Compilation: 
+# Compiled programs are put in directory Objs/
+# create Objs/ directory 
+sh> make depend
+# compile code  
+sh> make 
+# to clean before recompiling
+sh> make clean 
+
+o Running :
+# check the updated list of program options and arguments 
+# using the -h option 
+sh> ./Objs/rdvisip4 -h 
+--- rdvisip4.cc : Read PPF files produced by mfacq time-frequency
+
+Usage: rdvisip4 [-options] [usegain] [meanfft] [cxfreq] 
+    usegain : use the gain file to correct visibilities before averaging 
+       if usegain not specified, gains computed and saved to file 
+    meanfft : try to read mean FFT coeff and subtract it from visib. 
+    cxfreq : try to read  cross-frequency correlation matrix and compute mean of it 
+    WARNING: Only one of the two options (meanfft , cxfreq) can be specified 
+ P4AnaParams::UsageOptions(): -in5 -in6 -inrange -inall -inseltm -gnu -o -nmean -tfm -freq -prt 
+    [-in5 InputPath_BAO5]   [-in6 InputPath_BAO6]  
+    [-inrange Imin,Imax[,Istep] ]  [-inall] [-inseltm YYYY-MM-DDThh:mm:ss duration_minutes] 
+    [-o outfilename] [-gnu gain_filename] [-nmean N] [-reorderfreq] 
+    [-tfm timebin,freqbin]  [-freq f0,df] [-prt level] 
+ -in5/6 InputPath_BAO5/6 : input file path for BAO5 and BAO6 
+ -inrange Imin,Imax[,Istep] : define range of visibilite matrices to be processed (Imin<=I<=Imax with step Istep) 
+ -inall : try to process all visibility matrices present in data directory 
+ -inseltm date_timeTU duration : define set of visibility matrices to be processed as time interval 
+      centered at date_timeTU (YYYY-MM-DDThh:mm:ss) and duration in minutes 
+ -o outfilename : specify output file name 
+ -fo outfilename : specify output fits name 
+ -gnu gain_filename: gain g(nu) file name 
+ -nmean N: compute average (and sigma...) using N visibility matrices 
+ -reorderfreq: activate frequency reordering in VisiP4Reader, suitable for FFT firmware 
+ -tfm timebin,freqbin : time-frequency maps, averaging timebin=nb of visi matrices, freqbin frequency components 
+ -freq f0,df : definition of a frequency band centered on f0, with total width df (in MHz) 
+     several frequency bands can be specified by mutiple -freq options 
+ -prt level,modulo: define print level and print modulo count 
+
+o Scripts :
+ - example_doproc.sh  to run analysis programs 
+
+ - Scripts/p4quicklook.pic (see the file for more information)
+
+sh> spiapp -term -exec p4quicklook.pic ;  stty sane
+piapp> p4qlopen  ObservationName
+piapp> tracegains 
+piapp> traceautocor  FrequenceMHz
+piapp> tracecxHH   FrequenceMHz
+
+

example_doproc.sh

@@ -2,38 +2,36 @@
 #####################################################################
 ############### BAORadio/PAON4 - R. Ansari  , March-April 2015 
 ### Example script to run rdvisip4 program to compute a gain file
-###  and then visi2ntac to compute gain corrected power in the 
-###  8 auto-correlations, as a function of time (as NTuple)
+###  and then visiavg to compute time-frequency maps for the 
+###  8 auto-correlations and 6 H-H cross-corrleations 
 #####################################################################
 #
-#DLIST="CasA1142N9mar15 CasA1142N10mar15 CasA1142N11mar15"
-# DLIST="CasA1142N9mar15 CasA1142N10mar15"
-DLIST="CygA665S10mar15"
 # DLIST="CasA1142N11mar15 CasA1142N12mar15 CasA1142N13mar15 CasA1142N20mar15"
-echo 'DBG****A' $DLIST 
+# DLIST="Test22sep17"
+#DLIST="CygA22sep17"
+# DLIST="CygA29sep17"
+DLIST="CygA_M31_5oct17"
+echo '------ Script doproc.sh DLIST=' $DLIST 
 for D in $DLIST ; do 
-  echo '*DBG*B in the loop ' $D 
-  NFILE=11500
-  IFILEG=100,300
-  JFREQ=1300,1460
-  JFREQB=2130,2290
+  echo '----- Processing observations in' $D 
+  IFILEG=50,200
   IN5=/Raid-bao5/PAON4/$D
   IN6=/Raid-bao6/PAON4/$D
   GAINFILE=/Raid/PAON4/RzProc/gain_$D.ppf 
   OUTFILE1=/Raid/PAON4/RzProc/mvis_$D.ppf 
   OUTFILE=/Raid/PAON4/RzProc/$D.ppf 
+  echo '-------------------------------------------------------------'
   echo '-----Computing gains for  D=' $D
-  CMD="./rdvisip4 $IN5 $IN6 $IFILEG $OUTFILE1 $GAINFILE 0"
+  CMD="./rdvisip4 -in5 $IN5 -in6 $IN6 -inrange $IFILEG -gnu $GAINFILE -o $OUTFILE1"
   echo $CMD 
   time $CMD
-#  echo '-----Processing visibilities in D=' $D
-#   CMD="./visi2ntac $IN5 $IN6 0,$NFILE $GAINFILE $OUTFILE $JFREQ $JFREQB 20 0"
-  echo '-----Processing visibilities -> DataTable(AutoCor,CrossCor) in D=' $D
-### Note : Argument optionnel [ -tfm 12 ]  --> cartes temps-frequence des Xcor, binning en frequence 12 
-###  binning en frequence 12 = 12 x 61 kHz ~= 0.72 MHz 
-  CMD="./visi2dtacx -tfm 12 $IN5 $IN6 0,$NFILE $GAINFILE $OUTFILE 1375. 1410. 1. 20 0"
-  echo $CMD
-  time $CMD 
+  echo '-------------------------------------------------------------'
+  echo '-----Computing time-frequency maps for  D=' $D
+  CMD="./visi2dtacx -in5 $IN5 -in6 $IN6 -inall -gnu $GAINFILE -nmean 20 -tfm 10,4 -freq 1420.8,1 -freq 1330.,1 -o $OUTFILE
+ -tfmacx"
+  echo $CMD 
+  time $CMD
+
 done
 
 

makefile

@@ -17,6 +17,9 @@ clean :
 	rm -f $(OBJ)/rdvisip4.o  $(OBJ)/visi2ntac.o  $(OBJ)/visi2dtacx.o  $(OBJ)/visi2tmfreq.o $(OBJ)/p4conv2fits.o $(OBJ)/msvis2dt.o $(OBJ)/visiavg.o
 	rm -f $(MYOLISTHERE)
 
+depend : 
+	mkdir Objs/
+
 ###############################################################
 ### Compilation de .o 
 ######