Changeset 4001 in Sophya

Timestamp:

Jun 14, 2011, 10:30:47 PM (13 years ago)

Author:

ansari

Message:

Suite (2) amelioration prog calcul correlation ADC-CRT, Reza 14/06/2011

File:

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

trunk/AddOn/TAcq/corrcrtadc.cc

@@ -116 +116 @@
   string inoutpath = arg[1];  
   string outname = arg[2];
-  int aids[4]={0,1,-1,1};
+  int aids[4]={0,1,-1,-1};
   if (narg>3) sscanf(arg[3],"%d,%d,%d,%d",aids,aids+1,aids+2,aids+3);
   vector<int> adcids;
   for(int ii=0;ii<4;ii++) 
-    if((aids[ii]>0)&&(aids[ii]<16))  adcids.push_back(aids[ii]);
+    if((aids[ii]>=0)&&(aids[ii]<16))  adcids.push_back(aids[ii]);
   int imin=0;
   int imax=0;
@@ -134 +134 @@
   cout <<  " InOutPath= " << inoutpath << " ADCIds: " ;
   for(size_t ii=0; ii<adcids.size(); ii++) cout << adcids[ii] << " , ";
-  cout << " (NbADC=" << adcids.size() << ") OutFileName=" << outname << endl;
-  cout << " IMin,Max,Step="    << imin << "," << imax << "," << istep 
-       << "Frequency num range JF=" << jf1 << "," << jf2 << "," << nfreq << "  ------- " << endl;
+  cout << " (NbADC=" << adcids.size() << ") OutFileName= " << outname 
+       << " IMin,Max,Step="    << imin << "," << imax << "," << istep << endl;
+  //       << "Frequency num range JF=" << jf1 << "," << jf2 << "," << nfreq << "  ------- " << endl;
   int rc=0;
   if (fillhis) rc = ADCFiles2Histo(inoutpath, adcids, outname, imin, imax, istep);
@@ -150 +150 @@
 #define ADCNREAD 8192 
 
-static int PRTMODULO = 250;
+static int PRTMODULO = 1000;
 
 // Pour traitement (calcul FFT et visibilites (ProcA) 1 fibre, 2 voies RAW)