Changeset 4006 in Sophya

Timestamp:

Jun 16, 2011, 7:21:52 PM (13 years ago)

Author:

ansari

Message:

Amelioration print numero canaux, Reza 16/6/2011

File:

• trunk/AddOn/TAcq/corrcrtadc.cc (modified) (1 diff)

trunk/AddOn/TAcq/corrcrtadc.cc

@@ -246 +246 @@
 
   cout << " --------------- Channel/Correlation number association --------------- " << endl;
-  cout << " CorreNumber- axb  (MtxRow) :  (Ca, Cb)  -- ADCChan(c,d) " << endl; 
+  cout << " CorreNumber- axb  (MtxRow) :  (Ca, Cb)  -- ADCChan(c,d) -- I/Q(e,f)" << endl; 
   cout << " ----------------------------------------------------------------------- " << endl;
   sa_size_t jcr=0;
+  char IQid[2];
+  char EWid[2];
+  int EWnum[2];
+  int Bid[2];
+  int Inpid[2];
+
   for(sa_size_t j1=0; j1<cfour.NRows(); j1++) {
     for(sa_size_t j2=j1; j2<cfour.NRows(); j2++) {
-      cout <<  jcr << " : (" << j1 << "," << j2 << ") -> ADCChans (" << adcchans[j1] << "," << adcchans[j2] << ")" << endl;
+      cout <<  jcr << " : (" << j1 << "," << j2 << ") -> ADCChans (" << adcchans[j1] << "," << adcchans[j2] << ") -- (";
+      Bid[0]=adcchans[j1]/4;
+      Bid[1]=adcchans[j2]/4;
+      Inpid[0]=adcchans[j1]%4;
+      Inpid[1]=adcchans[j2]%4;
+
+      if ((adcchans[j1]/4)%2==0) IQid[0]='I'; else IQid[0]='Q'; 
+      if ((adcchans[j2]/4)%2==0) IQid[1]='I'; else IQid[1]='Q'; 
+      if (adcchans[j1]%2==0) EWid[0]='E'; else EWid[0]='W'; 
+      if (adcchans[j2]%2==0) EWid[1]='E'; else EWid[1]='W'; 
+      cout << IQid[0] << '-' << EWid[0] << Bid[0]+Inpid[0]/2 << "," 
+           << IQid[1] << '-' << EWid[1] << Bid[1]+Inpid[1]/2 << ")" << endl;
       jcr++;
     }