Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit 547a98a6 authored by Reza  ANSARI's avatar Reza ANSARI
Browse files

correction code de remise en ordre des frequences, Reza 28/02/2015

parent 265b45e8
......@@ -53,11 +53,12 @@ bool VisiP4Reader::ReadNext(TMatrix< complex<r_4> > & vismtx, TimeStamp& dateobs
vismtx.ReSize(NVIS, NFREQ);
TMatrix< complex<r_4> > svismtx;
TMatrix< complex<r_4> > & myvismtx = vismtx;
TMatrix< complex<r_4> > * vmtxp=&vismtx;
if (fgreorderfreq) { // s'il faut reordonner les frequences, on a besoin d'une matrice tampon
svismtx.ReSize(NVIS, NFREQ);
myvismtx=svismtx;
vmtxp=&svismtx;
}
TMatrix< complex<r_4> > & myvismtx = (*vmtxp);
char filenamebuff[2048];
// loop over the files created by each VisCalculator (each file contains a set of visibilities)
for(int b=0; b<NBAND; b++) {
......@@ -69,7 +70,9 @@ bool VisiP4Reader::ReadNext(TMatrix< complex<r_4> > & vismtx, TimeStamp& dateobs
sa_size_t rvl=rvf+NVIS/NVISGRP-1; // last row of vismtx to be filled (pair number)
//DBG cout << " *DBG* row range:"<<rvf<<","<<rvl<<endl;
sprintf(filenamebuff,"%s/vismtx_%d_%d.ppf",paths[b].c_str(), g, curfilenum);
if (prtlevel>1) cout << " VisiP4Reader::ReadNext() - opening file: "<<filenamebuff<<endl;
if (prtlevel>1)
cout << " VisiP4Reader::ReadNext() - opening file: "<<filenamebuff
<<" freqRange="<<cvf<<"-"<<cvl<<endl;
{
PInPersist pin(filenamebuff);
TMatrix< complex<r_4> > vmtx;
......@@ -110,7 +113,7 @@ void VisiP4Reader::ReorderFreqs(TMatrix< complex<r_4> > & svismtx, TMatrix< comp
dvismtx.Column(NFREQ/2) = svismtx.Column(fifoSize);
// Sortie 2
for (sa_size_t i=0; i<fifoSize; i++) {
dvismtx.SubMatrix(Range::all(), Range(fifoSize-i)) = svismtx.SubMatrix(Range::all(), Range(NFREQ/2+i));
dvismtx.Column(fifoSize-i) = svismtx.Column(NFREQ/2+i);
}
// k = 0 et k = N/2
// Voir Remarque ci-dessus Z(N/2).real -> Z(0).image , cad real(fmax)
......
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