Changeset 3647 in Sophya for trunk/AddOn/TAcq/svv2mtx.cc

Timestamp:

Jun 12, 2009, 4:49:47 PM (16 years ago)

Author:

ansari

Message:

Petites amelioration programme traitrement donnees de Pittsburgh - Reza 12/06/2009

File:

• trunk/AddOn/TAcq/svv2mtx.cc (modified) (7 diffs)

trunk/AddOn/TAcq/svv2mtx.cc

@@ -40 +40 @@
 int Usage(bool fgshort=true);
 // Pour traitement (calcul FFT et visibilites (ProcA) 1 fibre, 2 voies RAW)
-int ProcSVFiles(string& inoutpath, int imin, int imax, int istep, int jf1, int jf2, int card=1);
+int ProcSVFiles(string& inoutpath, int imin, int imax, int istep, int jf1, int jf2, int nfreq, int card=1);
 
 //----------------------------------------------------
@@ -61 +61 @@
     int jf1=0;
     int jf2=0;
-    sscanf(arg[3],"%d,%d",&jf1,&jf2);
+    int nfreq=0;
+    sscanf(arg[3],"%d,%d,%d",&jf1,&jf2,&nfreq);
     cout << " ----- svv2mtx.cc Start - InOutPath= " << inoutpath << " IMin,Max,Step=" 
          << imin << "," << imax << "," << istep << " JF=" << jf1 << "," << jf2 << "  ------- " << endl;
@@ -94 +95 @@
 
 // Pour traitement (calcul FFT et visibilites (ProcA) 1 fibre, 2 voies RAW)
-int ProcSVFiles(string& inoutpath, int imin, int imax, int istep, int jf1, int jf2, int card)
+int ProcSVFiles(string& inoutpath, int imin, int imax, int istep, int jf1, int jf2, int nfreq, int card)
 {
   Timer tm("ProcSVFiles");
   char fname[512];
 // NTuple 
-  const char* nnames[8] = {"fcs","tts","s1","s2","s12","s12re","s12im","s12phi"};
-  NTuple nt(8, nnames);
-  double xnt[10];
+  const char* nnames[10] = {"fcsm","ttsm","jfreq","s1","s2","s12","s12re","s12im","s12phi","s12mod"};
+  NTuple nt(10, nnames);
+  double xnt[15];
   uint_4 nmnt = 0;
-  double ms1,ms2,ms12,ms12re,ms12im,ms12phi;
+  double ms1,ms2,ms12,ms12re,ms12im,ms12phi,ms12mod;
 
   TMatrix<r_4> s1, s2;
-  TMatrix<r_4> v12re, v12im, v12phi;
+  TMatrix<r_4> v12re, v12im, v12phi,v12mod;
   sa_size_t ncols = (imax-imin+1)/istep;
   sa_size_t nrows = 10;
@@ -143 +144 @@
       v12im.SetSize(nrows, ncols);
       v12phi.SetSize(nrows, ncols);
+      v12mod.SetSize(nrows, ncols);
     }
     s1.Column(kc) = sv1;
@@ -149 +151 @@
     v12im.Column(kc) = imag(vv12);
     v12phi.Column(kc) = phase(vv12);
-    nmnt=0;  ms1=ms2=ms12=ms12re=ms12im=ms12phi=0.;
-    for(sa_size_t jf=jf1; jf<=jf2; jf++) { 
-      ms1 += s1(jf,kc);
-      ms2 += s2(jf,kc);
-      ms12re += v12re(jf,kc);
-      ms12im += v12im(jf,kc);
-      ms12phi += v12phi(jf,kc);
-    }
-    nmnt = (jf2-jf1+1);
-    if (nmnt>0)  {
-      double fnorm = (double)nmnt; 
-      xnt[0] = kc;
-      xnt[1] = 0;
-      xnt[2] = ms1 /= fnorm;
-      xnt[3] = ms2 /= fnorm;
-      xnt[4] = ms12 /= fnorm;
-      xnt[5] = ms12re /= fnorm;
-      xnt[6] = ms12im /= fnorm;
-      xnt[7] = ms12phi /= fnorm;
-      nt.Fill(xnt);
-    }
-
+    v12mod.Column(kc) = module(vv12);
+
+// Calcul moyenne dans des bandes en frequence 
+    int deltajf=(jf2-jf1)/nfreq;
+    if (deltajf<1) deltajf=1; 
+    for(int kf=0; kf<nfreq; kf++) {
+      sa_size_t jfstart=jf1+kf*deltajf;
+      sa_size_t jfend=jfstart+deltajf;
+      if (jfend>jf2)  break;
+      nmnt=0;  ms1=ms2=ms12=ms12re=ms12im=ms12phi=ms12mod=0.;
+      for(sa_size_t jf=jfstart; jf<jfend; jf++) { 
+        ms1 += s1(jf,kc);
+        ms2 += s2(jf,kc);
+        ms12re += v12re(jf,kc);
+        ms12im += v12im(jf,kc);
+        ms12phi += v12phi(jf,kc);
+        ms12mod += v12mod(jf,kc);
+      }
+      nmnt = (jfend-jfstart);
+      if (nmnt>0)  {
+        double fnorm = (double)nmnt; 
+        xnt[0] = ((int_8)(sv1.Info()["StartFC"])+(int_8)(sv1.Info()["EndFC"]))*0.5;
+        xnt[1] = ((int_8)(sv1.Info()["StartTT"])+(int_8)(sv1.Info()["EndTT"]))*0.5;
+        xnt[2] = kf;
+        xnt[3] = ms1/fnorm;
+        xnt[4] = ms2/fnorm;
+        xnt[5] = ms12/fnorm;
+        xnt[6] = ms12re/fnorm;
+        xnt[7] = ms12im/fnorm;
+        xnt[8] = ms12phi/fnorm;
+        xnt[9] = ms12mod/fnorm;
+        nt.Fill(xnt);
+      }
+    }
     kc++;
 
@@ -213 +227 @@
 {
   cout << " --- svv2mtx.cc : Read PPF files produced by mcrd to make matrices BAORadio" << endl;
-  cout << " Usage:  mcrd InOutPath Imin,Imax,step NumFreq1,NumFreq2 [card=1]" << endl; 
+  cout << " Usage:  mcrd InOutPath Imin,Imax,step NumFreq1,NumFreq2,NBinFreq [card=1]" << endl; 
   if (fgshort) {
     cout << " mcrd -h for detailed instructions" << endl;
@@ -221 +235 @@
   cout << " Imin,Imax,IStep: Input PPF files sequence number \n"
        << "    FileNames=InOutPath/Ch12_II.fits Imin<=II<=Imax II+=IStep \n" 
+       << " NumFreq1,NumFreq2,NBinFreq: Freq Zone and number of frequency bins for ntuple\n"
        << " card=1 Ch12 , card=2 Ch34 " << endl;
   return 1;