Commit 0b5b2f56 authored by Reza Ansari's avatar Reza Ansari
Browse files

resolution conflict apres git pull ds visiavg.cc , Reza 15/12/2017

parents 30f3bb0b f10622a7
Quelques indications pour runner les programmes
> fringeVx.cc: fit des paramètres des visibilités lors d'une transit de type CasA
> postFringeVx.cc: ajustement des paramétres des phases "electroniques"
> fit<>.pic: des scripts piapp pour utiliser les outputs des prgs precedents
faire tout d'abord activer le setup qui redefinit le LD_LIBRARY_PATH pour charger au vol
la librairie de Minuit2
> . ./setup.sh
Les Methodes appelees par le Main de chaque *.cc C++-file sont des "actions" par la suite. Elles
sont documentees dans le code en particulier pour definir les I/O qui sont donnees par le user
a travers des options en ligne de commande.
1) fringeVx.cc (x=6 au 18/11/2017)
-================================
Le programme dispose d'une option "-h" qui donne qq indications de base
Par rapport a l aversion V5:
o nouvelles options infile/inpfile/outfile
o actions: fitAll/rotate
[bao@bao3 JEC]$ ./bin/fringeV6 -h
options:
-act: action [fitAll]
-indir: input dir (ex.: ./CasA/)
-inpdir: input dir des parametres par exemple [./CasA/]
-outdir: output dir [./CasA/]
-infile: possibility to give the input file name
-inpfile: possibility to give the input parameter file name
-outfile: possibility to give the ouput file name
-src: source name (ex. CasA18oct17)
-ra: Right Ascension (J2000 H:M:S.S) (ex. 23:23:27.9)
-dec: Declinaison (J2000 D:M:S.S) (ex. 58:48:42.0)
-meridian: approximate meridian date (ex. 2017-10-18T21:00:00)
-f: freq. range MHz freqMin,freqMax,freqBand (ex. 1300,1450,1): notice freqBand not used
-hasel: hour angle selected in [hamin,hamax] (Degree): (ex. -10,10)
-type: type de cross REal or IMag [RE] (WARNING PARTIE_REELLE define sould be tuned accordingly for the moment)
En principe:
o action
- "fitAll" par defaut n'est pas à changer.
Elle permet de faire le fit separe
des auto-corr puis le fit combine des cross corr de type HH (ou VV par #define interne)
- "rotate" Apply NS phase to rotate the visibilities once
the electronic phase as been removed (see postFringeVx.cc action). This leeds to EW-only visibilities local to the
user target RA location
o indir: est a donner soit au vol soit une fois pour toute on le met en hard dans le code.
C'est le directory ou sont stockees les cartes temps-frequence
o outdir: le path est a changer sauf si on veut stocker les fichiers de sorti insitu
o infile/inpfile/outfile: permettent de surcharger les noms des divers fichers en input et output
o src : renseigne le tag des ficheirs temps frequence (en general <src><date>)
o ra/dec: depend de la source en question. Dans le fichier on a CasA (actif) et aussi (CygA).
o meridian: c'est une date qui fixe le debut de la recherche DU PROCHAIN TRANSIT
o f : precise la plage de frequence sur laquelle les fit vont etre effectues frequence par
frequence. Il n'y a pas de traitement (filtrage/nettoyage/regroupement). freqBand (le
3eme parametre n'est pas actif)
o hasel: definit en angle horaire la plage qui sert au traitement du transit (en particulier
le fond sous le pic)
un output typique en mode de routine est un fichier
fitCross-CasA31oct17-1300-1450-RE.ppf
qui inclue une datatable de Sophya:
NamedObjMgr::PrintObj(/home/dt) Type: N6SOPHYA9DataTableE
BaseDataTable: NVar= 44 NEnt= 616 ( SegSize= 512 NbSegments= 2 )
------------------------------------------------------------------------------
i: Name [Sz] (Typ) | Min | Max | Units
------------------------------------------------------------------------------
0: freq ( F) | 1300.08 | 1450.23 |
1: rc ( I) | -1 | 0 |
2: NormCross1 ( F) | 7785.96 | 81151.3 |
3: Deff1 ( F) | 3 | 6 |
4: Az1 ( F) | -2.08786 | 5 |
5: NormCross2 ( F) | 7889.93 | 117294 |
6: Deff2 ( F) | 3.61723 | 5.45368 |
7: Az2 ( F) | -0.535631 | 1.87781 |
8: NormCross3 ( F) | 8151.26 | 73744.6 |
9: Deff3 ( F) | 3.69731 | 5.62176 |
10: Az3 ( F) | -5 | 0.497907 |
11: NormCross4 ( F) | 21485.1 | 432339 |
12: Deff4 ( F) | 3.8969 | 6 |
13: Az4 ( F) | -2.89025 | -0.661404 |
14: X2 ( F) | 0 | 0 |
15: Y2 ( F) | 5.993 | 5.993 |
16: Z2 ( F) | 0 | 0 |
17: X3 ( F) | -5.996 | -5.996 |
18: Y3 ( F) | -4.38 | -4.38 |
19: Z3 ( F) | 0 | 0 |
20: X4 ( F) | 5.995 | 5.995 |
21: Y4 ( F) | -4.38 | -4.38 |
22: Z4 ( F) | 0 | 0 |
23: Phi2H ( F) | -2.96587 | 0.721676 |
24: Phi3H ( F) | -3.13881 | 3.1338 |
25: Phi4H ( F) | -3.10297 | 3.1226 |
26: CTCross1H2H ( F) | -7960.76 | 170960 |
27: CTCross1H3H ( F) | -157511 | 46905 |
28: CTCross1H4H ( F) | -37193.2 | 11094 |
29: CTCross2H3H ( F) | -90395.2 | 6684.92 |
30: CTCross2H4H ( F) | -34872 | 9824.64 |
31: CTCross3H4H ( F) | -5746.15 | 69944.4 |
32: NormAuto1 ( F) | 32394.6 | 161237 |
33: CTAuto1 ( F) | 1.1502e+06 | 1.46487e+06 |
34: SLAuto1 ( F) | -463749 | 179850 |
35: NormAuto2 ( F) | 73972.7 | 178872 |
36: CTAuto2 ( F) | 1.11619e+06 | 1.75237e+06 |
37: SLAuto2 ( F) | -408491 | 123308 |
38: NormAuto3 ( F) | 34166.3 | 53861.6 |
39: CTAuto3 ( F) | 615701 | 778686 |
40: SLAuto3 ( F) | -176669 | 195317 |
41: NormAuto4 ( F) | 25896 | 83868.8 |
42: CTAuto4 ( F) | 752218 | 1.05184e+06 |
43: SLAuto4 ( F) | -118136 | 74392.2 |
------------------------------------------------------------------------------
2) postFringeVx.cc (x=2 au 16/11/17)
=================
Le programme dispose d'une option "-h" qui donne qq indications de base
Depuis la version de base
o infile/inpfile/outfile: permettent de surcharger les defaults file name en input et output
o actions: fitPhase/rotate
[bao@bao3 JEC]$ ./bin/postFringeV2 -h
usage ex: ./bin/postFringe >& tmp
options:
-act: action [estimePhase]
-indir: input dir des datas par exemple [./CasA/]
-inpdir: input dir des parametres par exemple [./CasA/]
-outdir: output dir [./CasA/]
-infile: possibility to give the input file name
-inpfile: possibility to give the input parameter file name
-outfile: possibility to give the ouput file name
-f: freq. range MHz freqMin,freqMax (ex. 1300,1450)
-src: source name (ex. CasA18oct17)
-type: type de cross REal or IMag [RE]
o act:
- "estimePhase": Determine the phase parameters after a cross (& auto) visibilities fit
procedure from fringeVx.cc :: fitAutoCrossCorr method
- "rotate" : Apply electronic phase to rotate the visibilities
o indir: c'est le directory pour acceder au fichier output de fringeVx.cc (cf. la datatable
des parametres de fit d'une transit) ou bien le fichier des TFM dont on veut faire une rotation
de phase
o inpdir: c'est le directory des parametres de phase
o outdir: directory de stockage des outputs
o f: precise les 2 frequences min max donnees dansle nom du fichier input
o src: precise aussi le nom du fichier input en donnant le nom de la source
o type: par default c'est RE a savoir que se sont les parties reelles des cross-corr. Si
ce sont les parties IMaginaires alors mettre "IM"
Un output typique est un fichier:
a) dans la "console" outre des debug, il y a le resultat de l'ajustement de parametres
pour chaque phase
Pour Phi2H
-------------------------
The model selected is: linear with
xref = 1375.152587890625 yref = -2.5804805755615234375 slope= -0.0041318359374999998751
-------------------------
Pour Phi3H
-------------------------
The model selected is: sawtooth with
1/periode = 0.05565275701111126877 xref = -1435.2843925781251073
-------------------------
Pour Phi4H
-------------------------
The model selected is: sawtooth with
1/periode = 0.070963965382242408242 xref = -1393.1309238281251055
-------------------------
b) et un fichier ppf
PhaseResidual-CasA31oct17-1300-1450-RE.ppf
qui regroupe 3 GeneralFitData presentant les residus des ajustement des phase Phi2H,3H,4H
NamedObjMgr::ListObjs( /home/* ) TotNObjs= 3
0/ N6SOPHYA14GeneralFitDataE : /home/ResPhi2H
1/ N6SOPHYA14GeneralFitDataE : /home/ResPhi3H
2/ N6SOPHYA14GeneralFitDataE : /home/ResPhi4H
3) Scripts Piapp
================
Pour faire des plots a partir des fichiers ppf issus de fringeVx.cc et postFringe.cc
> spiapp -term -exec fit.pic CasA31oct17; stty sane
visualise les dependances en frequence des parametres des auto et cross correlations
> spiapp -term -exec fitdebug.pic CasA31oct17; stty sane
dans le cas ou fringeVx.cc est compiler avec un tuning d'une variable CPP
#define DEBUG_THRESH 301
alors
4 fichiers fitAllAuto-CasA31oct17-<AUTO>-RE.ppf
6 fichiers fitAllCross-CasA31oct17-<CROSS>-RE.ppf
sont generes et le script presente les visi et les courbes de fit superposes.
> spiapp -term -exec fitphi.pic CasA31oct17; stty sane
visualise les residus (dependance en fonction de la frequence)
entre les phases et les modeles estimes.
> phaserot.pic
permet de visualiser les cross-visibilites
"raw", "sans les phases electroniques" et "localement sans la phase NS"
set source $1
echo "process source: <${source}>"
set fMin 1300
set fMax 1450
openppf fitCross-${source}-${fMin}-${fMax}-RE.ppf
setaxesatt "font=times,bold,20 fixedfontsize"
graphicatt "font=times,bold,20 fixedfontsize grid"
set color ( blue red green black )
newwin 2 2
for i 1:5
j = i-1
n/pl dt.NormCross${i}%freq 1 ! " cpts black notit nsta xylimits=${fMin},${fMax},0,1.5e5"
settitle "Dish $i ($source)"
setaxelabels "Freq (Hz)" "NormCross" "font=times,bold,20 fixedfontsize"
end
newwin 2 2
for i 1:5
j = i-1
n/pl dt.NormAuto${i}%freq 1 ! " cpts black notit nsta xylimits=${fMin},${fMax},0,1.5e5"
settitle "Dish $i ($source)"
setaxelabels "Freq (Hz)" "NormAuto" "font=times,bold,20 fixedfontsize"
end
newwin 2 2
for i 1:5
j = i-1
n/pl dt.Deff${i}%freq 1 ! " cpts black notit nsta xylimits=${fMin},${fMax},3,6"
settitle "Dish $i ($source)"
setaxelabels "Freq (Hz)" "Deff (m)" "font=times,bold,20 fixedfontsize"
end
newwin 2 2
for i 1:5
j = i-1
n/pl dt.Az${i}%freq 1 ! " cpts black notit nsta xylimits=${fMin},${fMax},-5,5"
settitle "Dish $i ($source)"
setaxelabels "Freq (Hz)" "Azimuth (deg)" "font=times,bold,20 fixedfontsize"
end
set CTxECH12 ( CTCross1H2H CTCross1H3H CTCross1H4H CTCross2H3H CTCross2H4H CTCross3H4H )
newwin 3 2 1000 800
for c 0:6
n/pl dt.$CTxECH12[c]%freq 1 ! "cpts nsta notit black xylimits=${fMin},${fMax},-2e4,2e4"
settitle "${source}"
setaxelabels "Freq (Hz)" "$CTxECH12[c]" "font=times,bold,20 fixedfontsize"
end
newwin 2 2
for i 1:5
j = i-1
n/pl dt.CTAuto${i}%freq 1 ! " cpts black notit nsta"
settitle "Dish $i ($source)"
setaxelabels "Freq (Hz)" "CTAuto${i}" "font=times,bold,20 fixedfontsize"
end
newwin 2 2
for i 1:5
j = i-1
n/pl dt.SLAuto${i}%freq 1 ! " cpts black notit nsta"
settitle "Dish $i ($source)"
setaxelabels "Freq (Hz)" "SLAuto${i}" "font=times,bold,20 fixedfontsize"
end
fillgd1 gdPhi3H dt freq Phi3H 1
fillgd1 gdPhi4H dt freq Phi4H 1
del phi3H4H
c++compile phi34
c++link phi34.so doIt
call doIt
newwin 2 2
for i 2:5
j = i-1
n/pl dt.Phi${i}H%freq 1 ! "marker=fcircle,5 black notit nsta xylimits=${fMin},${fMax},-6,6"
settitle "($source), Phi1H=0"
setaxelabels "Freq (Hz)" "Phi${i}H (rad)" "font=times,bold,20 fixedfontsize"
end
plot2d phi3H4H x0 y 1 "marker=fcircle,5 nsta notit xylimits=${fMin},${fMax},-3.5,3.5"
settitle "($source), Phi1H=0"
setaxelabels "Freq (Hz)" "Phi4H-Phi3H (rad)" "font=times,bold,20 fixedfontsize"
set source $1
setaxesatt "font=times,bold,20 fixedfontsize"
graphicatt "font=times,bold,20 fixedfontsize grid"
set vecAUTO ( 1H 2H 3H 4H )
newwin 2 2
foreach x ( $vecAUTO )
openppf fitAllAuto-${source}-${x}.ppf
mv dataFit dataFit${x}
mv dataFit_func dataFit_func${x}
nt2d dataFit${x} x0 y ex0 ey 1 ! "marker=fcircle,5 nsta ntit"
nt2d dataFit_func${x} x0 y ex0 ey 1 ! "same cpts red nsta ntit"
settitle "${source} : ${x}"
setaxelabels "h.a (rad)" "Auto (a.u)" "font=times,bold,20 fixedfontsize"
end
set vecCROSS ( 1H2H 1H3H 1H4H 2H3H 2H4H 3H4H )
newwin 3 2
foreach x ( $vecCROSS )
openppf fitAllCross-${source}-${x}-RE.ppf
mv dataFit dataFit${x}
mv dataFit_func dataFit_func${x}
nt2d dataFit${x} x0 y ex0 ey 1 ! "marker=fcircle,5 nsta ntit"
nt2d dataFit_func${x} x0 y ex0 ey 1 ! "same cpts red nsta ntit"
settitle "${source} : ${x}"
setaxelabels "h.a (rad)" "Cross (a.u)" "font=times,bold,20 fixedfontsize"
end
set source $1
echo "process source: <${source}>"
set fMin 1300
set fMax 1450
openppf fitCross-${source}-${fMin}-${fMax}-RE.ppf
setaxesatt "font=times,bold,20 fixedfontsize"
graphicatt "font=times,bold,20 fixedfontsize grid"
set Phase ( 2H 3H 4H )
newwin 2 2
foreach c ( $Phase )
fillgd1 gdPhi${c} dt freq Phi${c} 1
plot2d gdPhi${c} x0 y 1 "marker=fcircle,5 nsta notit xylimits=${fMin},${fMax},-3.5,3.5"
settitle "($source), Phi1H=0"
setaxelabels "Freq (Hz)" "Phi${c} (rad)" "font=times,bold,20 fixedfontsize"
end
openppf PhaseResidual-${source}-${fMin}-${fMax}-RE.ppf
newwin 2 2
foreach c ( $Phase )
plot2d ResPhi${c} x0 y 1 "marker=fcircle,5 nsta notit xylimits=${fMin},${fMax},-0.5,0.5"
settitle "($source)"
setaxelabels "Freq (Hz)" "Residus Phi${c} (rad)" "font=times,bold,20 fixedfontsize"
end
This diff is collapsed.
exec plotgain.pic CasA27nov17
##! Commander::Exec() Error opening file plotgain.pic
exec phaserot.pic CasA25nov17
# Makefile for PAON4 visibility analysis code
# Feb. 2015
include $(SOPHYABASE)/include/sophyamake.inc
MINUITDIR = /home/bao/JEC/Minuit2-5.34.14
MINUITLIB = -L$(MINUITDIR)/lib
MINUITINC = -I$(MINUITDIR)/include
# Define our target list
all : fringeV6 postFringeV2
default: fringV6 postFringeV2
clean :
rm -f ./Objs/* ./bin/*
#CXXFLAGS = -fno-common -O3 -fPIC -fopenmp -Wa,-q -Wall -Wno-deprecated-declarations -std=c++11 -march=native -ffast-math -m64
### C++11 CXXFLAGS = -fno-common -O3 -fPIC -Wa,-q -std=c++11 -march=native -ffast-math -m64
CXXFLAGS = -fno-common -O3 -fPIC -Wa,-q -march=native -ffast-math -m64
######
####
##prg analyse
fringeV6 : ./Objs/fringeV6.o
echo "Link..."
$(CXXLINK) -o ./bin/fringeV6 ./Objs/fringeV6.o $(MINUITLIB) -lMinuit2 $(SOPHYAEXTSLBLIST)
Objs/fringeV6.o : fringeV6.cc
echo "Compile..."
$(CXXCOMPILE) $(MINUITINC) -o ./Objs/fringeV6.o fringeV6.cc
postFringeV2 : ./Objs/postFringeV2.o
echo "Link..."
$(CXXLINK) -o ./bin/postFringeV2 ./Objs/postFringeV2.o $(MINUITLIB) -lMinuit2 $(SOPHYAEXTSLBLIST)
Objs/postFringeV2.o : postFringeV2.cc
echo "Compile..."
$(CXXCOMPILE) $(MINUITINC) -o ./Objs/postFringeV2.o postFringeV2.cc
set source $1
echo "process source: <${source}>"
openppf /Raid/PAON4/Olivier/Outputs/${source}.ppf
openppf /home/bao/JEC/TEST/TFM-PhaseFree-${source}.ppf
openppf /home/bao/JEC/TEST/TFM-EWOnly-${source}.ppf
set cross ( 1H2H 1H3H 1H4H 2H3H 2H4H 3H4H )
foreach c ( $cross )
newwin 3 1 1800 600
imag TFM_${c} "grey128 zoom/2 cdreal stdaxes lut=lin,-1e4,1e4"
settitle "Cross $c"
imag TFM_RPF_${c} "grey128 zoom/2 cdreals stdaxes lut=lin,-1e4,1e4"
imag TFM_EW_${c} "grey128 zoom/2 cdreals stdaxes lut=lin,-1e4,1e4"
w2eps "img_${c}.eps"
end
./bin/postFringeV2 -act rotate -indir /Raid/PAON4/Olivier/Outputs/ -infile CasA25nov17.ppf -inpdir . -inpfile PhaseParam-CasA31oct17-1300-1450-RE.txt -outdir ./TEST/ -src CasA25nov17
./bin/fringeV6 -act rotate -inpdir . -inpfile fitCross-CasA31oct17-1300-1450-RE.ppf -indir ./TEST -infile TFM-PhaseFree-CasA25nov17.ppf -outdir ./TEST -src CasA25nov17 -meridian 2017-11-25T18:00:00 -hasel -10,10
\ No newline at end of file
This diff is collapsed.
export LD_LIBRARY_PATH=":/usr/local/lib/:/Dev/ExtLibs/lib:/Dev/Common/v2/Linux-x86_64/:/Dev/Sophya64//slb:/Dev/TestADC/v7r9/Linux-x86_64:/Dev/Sophya32/slb:/Dev/DisplayData/v2/Linux-x86_64:/Dev/DataSaver/v1/Linux-x86_64/:/home/bao/JEC/Minuit2-5.34.14/lib:/home/bao/JEC/Minuit2-5.34.14/lib"
......@@ -179,8 +179,7 @@ int main(int narg, const char* arg[])
sa_size_t tfmSX, tfmSY;
while (fgok) {
//reads next visimtx
// fgok=vreader.ReadNext(vismtx, cfdate, mttag);
//reads next visibility matrix window
fgok = wreader.Shift();
if (!fgok) break;
......@@ -190,6 +189,7 @@ int main(int narg, const char* arg[])
// Apply gain g(nu)
p4g.applyGain(vismtx);
if (cnt==0) { //resizing matrices for sum of auto-correlations and sum of 6 cross-correlations
acsum.SetSize(8, vismtx.NCols());
acsum_sq.SetSize(8, vismtx.NCols());
......@@ -249,6 +249,7 @@ int main(int narg, const char* arg[])
I++; // incrementing DeltaTime counter
if (I==deltaIavg) {
//---- On s'occupe d'abord des autocorrelations P1 ... P8
for(size_t k=0; k<KVAC.size(); k++) { // Loop over the 8 auto-correlations
TVector<r_4> vac = real(acsum.Row(k));
......@@ -262,8 +263,8 @@ int main(int narg, const char* arg[])
}
}
} //----- end of loop over the 8 AutoCor
//---- On s'occupe des 6 cross-correlations 1H-2H ... 3H-4H
for(size_t k=0; k<KVCXHH.size(); k++) { // loop over the 6 Xcor
TVector< complex<r_4> > vcx = cxsum.Row(k);
......@@ -299,12 +300,8 @@ int main(int narg, const char* arg[])
// --- Sauvegarde cartes temps-frequence en fits
//FitsABTWriter * fbtw = NULL;
FitsInOutFile * fos = NULL ;
if (fitsoutfile.length()>=1){
//cout<<">>>>> Creating a new fits file with FitsABTWriter"<<endl;
//fbtw = new FitsABTWriter(fitsoutfile,BINARY_TBL,3);
//fbtw->SetExtName("Test fits table 1");
//i1 = fbtw.AddCol("Time",NULL,"unit1",TDOUBLE);
if (fitsoutfile.length()>=1){
cout << " fitsoutfile" <<fitsoutfile<< endl;
fos = new FitsInOutFile(fitsoutfile, FitsInOutFile::Fits_Create);
}
......@@ -320,19 +317,23 @@ int main(int narg, const char* arg[])
for(int k=0; k<8; k++) { // loop over the 8 AutoCorr
TArray< r_4 > & tfmap = vtfmac[k];
tfmap *= (r_4)(1./((double)deltaIavg*(double)TFMfbin));
TArray< r_4 > & tfmapsq = vtfmac_sq[k];
tfmapsq *= (r_4)(1./((double)deltaIavg*(double)TFMfbin));
tfmapsq = tfmapsq - tfmap.MulElt(tfmap,tfmap) ;
potfm << PPFNameTag(tfm_names[k]) << tfmap;
potfm << PPFNameTag(tfmsq_names[k]) << tfmapsq;
if (fos != NULL) {
ext_names.push_back(tfm_names[k]);
(*fos)<< tfmap;
}
TArray< r_4 > & tfmapsq = vtfmac_sq[k];
tfmapsq *= (r_4)(1./((double)deltaIavg*(double)TFMfbin));
tfmapsq = tfmapsq - tfmap.MulElt(tfmap,tfmap) ; // tfmap ->tfmap*tfmap !!
potfm << PPFNameTag(tfmsq_names[k]) << tfmapsq;
if (fos != NULL) {
ext_names.push_back(tfmsq_names[k]);
(*fos)<< tfmapsq;
}
}
// --- renormalizing and saving H-H Cross-Corr time-frequency maps
cout<<" visiavg/Info: Saving 6 H-H cross-corr time-frequency maps to PPF file "<<outfile<<endl;
......@@ -346,6 +347,13 @@ int main(int narg, const char* arg[])
TArray< r_4 > & tfmap_sqpr = vtfm_rp_sq[k];
TArray< r_4 > & tfmap_sqpi = vtfm_ip_sq[k];
tfmap *= complex<r_4>((r_4)(1./((double)deltaIavg*(double)TFMfbin)), 0.);
potfm << PPFNameTag(tfmCC_names[k]) << tfmap;
if (fos != NULL) {
ext_names.push_back(string(tfmCC_names[k])+"_real");
(*fos)<< real(tfmap);
ext_names.push_back(string(tfmCC_names[k])+"_imag");
(*fos)<< imag(tfmap);
}
TArray< r_4 > tfmapr = real(tfmap);
TArray< r_4 > tfmapi = imag(tfmap);
......@@ -355,14 +363,9 @@ int main(int narg, const char* arg[])
tfmap_sqpr -= tfmapr ;
tfmapi = tfmapi.MulElt(tfmapi,tfmapi) ;
tfmap_sqpi -= tfmapi;
potfm << PPFNameTag(tfmCC_names[k]) << tfmap;
potfm << PPFNameTag(vrtfmCC_names[k]) << tfmap_sqpr;
potfm << PPFNameTag(vitfmCC_names[k]) << tfmap_sqpi;
if (fos != NULL) {
ext_names.push_back(string(tfmCC_names[k])+"_real");
(*fos)<< real(tfmap);
ext_names.push_back(string(tfmCC_names[k])+"_imag");
(*fos)<< imag(tfmap);
ext_names.push_back(vrtfmCC_names[k]);
(*fos)<< tfmap_sqpr;
ext_names.push_back(vitfmCC_names[k]);
......@@ -370,6 +373,7 @@ int main(int narg, const char* arg[])
}
}
potfm << PPFNameTag("TimeVec") << timevec ;
potfm << PPFNameTag("RAVec") << ravec ;
// --- FIN sauvegarde cartes temps-frequence
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment