Changeset 3997 in Sophya for trunk

Timestamp:

Jun 13, 2011, 11:12:09 PM (14 years ago)

Author:

ansari

Message:

Modifs/debug prog lecture/traitement dump ADC Pittsburgh/CRT , Reza, 13/06/2011

File:

• trunk/AddOn/TAcq/corrcrtadc.cc (modified) (8 diffs)

trunk/AddOn/TAcq/corrcrtadc.cc

@@ -44 +44 @@
 int DecodeProc(int narg, char* arg[]);
 int ProcessADCFiles(string& inoutpath, string& outname, int imin, int imax, int istep,  int jf1, int jf2, int nfreq);
-int ComputeCorrel(TMatrix< complex<r_4> >& cfour,  TMatrix< complex<r_8> >& correl);
+int ComputeCorrel(TMatrix< complex<r_4> >& cfour,  TMatrix< complex<r_8> >& correl, TMatrix< complex<r_8> >& autocorrel);
 //------------------------------------------------------------------------------------------------------------
 
@@ -138 +138 @@
 #define ADCNREAD 8192 
 #define NBADC 2
-#define NFREQUSED 1280 
+#define NFREQUSED 2000
 
   sa_size_t  NCHAN = 4*NBADC;
@@ -144 +144 @@
   sa_size_t  NCORREL = NCHAN*(NCHAN+1)/2;
   TMatrix< complex<r_8> > correl(NCORREL,NFREQUSED);
+  TMatrix< complex<r_8> > autocorrel(NCHAN,NFREQUSED);
 
   FILE* fip[NBADC]={NULL,NULL};
@@ -153 +154 @@
   char fname[512];
 
-  signed char rdbuff[16384]; 
+  signed char rdbuff[ADCRDBLKSZ]; 
   int prtmodulo=50;
   for(int ifile=imin; ifile<=imax; ifile+=istep) {
@@ -168 +169 @@
         fread(rdbuff,1,ADCRDBLKSZ,fip[ka]);
         for(int jac=0; jac<4; jac++) {
-          for(sa_size_t ls=0; ls<ADCFLEN; ls++) sigadc(ls)=(float)rdbuff[jac*ADCFLEN+ls];
+          for(sa_size_t ls=0; ls<ADCFLEN; ls++) sigadc(ls)=(float)rdbuff[ls*4+jac];
           ffts.FFTForward(sigadc, foursig);
-          cfour.Row(irc)=foursig(Range(400,1679));  irc++;
+          cfour.Row(irc)=foursig(Range(400,1679)).Transpose();  irc++;
         }
       }
-      ComputeCorrel(cfour, correl);
+      ComputeCorrel(cfour, correl, autocorrel);
       if (m%prtmodulo==0)  cout << " ProcessADCFiles/Info Done read+FFT+correl m=" << m << " / Max=" << ADCNREAD << endl;
     }
@@ -183 +184 @@
   cout << "ProcessADCFiles: Opening file " << fname << " for writing correlation matrix" << endl;  
   POutPersist po(fname);
-  po << correl; 
+  po << PPFNameTag("correlmtx") << correl; 
+  po << PPFNameTag("acorrmtx") << autocorrel; 
+
   cout << "ProcessADCFiles:  finished FFT + correlation computing " << endl;
   return 0;
@@ -189 +192 @@
 
 /* --Fonction-- */
-int ComputeCorrel(TMatrix< complex<r_4> >& cfour,  TMatrix< complex<r_8> >& correl)
+int ComputeCorrel(TMatrix< complex<r_4> >& cfour,  TMatrix< complex<r_8> >& correl, TMatrix< complex<r_8> >& autocorrel)
 {
   sa_size_t jcr=0;
@@ -196 +199 @@
       for(sa_size_t i=0; i<cfour.NCols(); i++) 
         correl(jcr,i) += complex<r_8> ( cfour(j1,i)*conj(cfour(j2,i)) ); 
+      if (j1==j2) autocorrel.Row(j1)=correl.Row(jcr);
       jcr++;
     }