Changeset 3940 in Sophya for trunk/AddOn/TAcq/chanum_1210.cc

Timestamp:

Jan 24, 2011, 5:02:54 PM (15 years ago)

Author:

cmv

Message:

acceleration prog + petits ajouts, cmv 24/01/2011

File:

• trunk/AddOn/TAcq/chanum_1210.cc (modified) (4 diffs)

trunk/AddOn/TAcq/chanum_1210.cc

@@ -32 +32 @@
     <<" -f F0MHz : 1ere frequence pour cette acquisition (def=0.)"<<endl
     <<" -F if0,if1,idf : selection freq de if0 a if1 moyenne par idf (def=\"0,8888,1\")"<<endl
-    <<" -T it0,it1 : selection fichier temps de it0 a it1 (def=\"0,999999\")"<<endl
+    <<" -T it0,it1 : selection fichier temps de it0 a it1 (def=\"0,99999\")"<<endl
     <<" -o fichier.csh : nom du fichier de sortie pour les commandes a lancer"<<endl;
 }
@@ -40 +40 @@
 {
   string outname = "chanum_1210.csh";
-  string selfreq = "0,8888,1", seltime = "0,999999";
+  string selfreq = "0,8888,1", seltime = "0,99999";
   double freq0 = 0.;
 
@@ -102 +102 @@
   ofstream ftxt(outname.c_str(), ofstream::out);
   cout<<"writing in "<<outname<<" (is_open="<<ftxt.is_open()<<")"<<endl;
+  if(!ftxt) {cout<<"!!!!OPENING failed "<<outname<<endl; return -3;}
   ftxt << "#!/bin/csh" <<endl;
-  if(!ftxt) {cout<<"!!!!OPENING failed "<<outname<<endl; return -3;}
   int dupli = 0, ndupli = 0;
   nvisi = 0;
   for(uint_4 i=0;i<vcode.size();i++) {
     char str[512];
-    sprintf(str,"${TACQEXE}/svv2mtx2_1210 -f %.7f -T %s -F %s"
+    sprintf(str,"time ${TACQEXE}/svv2mtx2_1210 -f %.7f -T %s -F %s"
             ,freq0,seltime.c_str(),selfreq.c_str());
     string argu = str;
@@ -115 +115 @@
     uint_4 vcode_suiv = (i<vcode.size()-1) ? vcode[IVcode(i+1)]: 99999999;
     uint_4 v1 = vcode[ip]/1000, v2 = vcode[ip]%100;
+    sprintf(str," -v %d,%d",v1,v2); argu += str;  // numero de canaux acq [1,32]
     sprintf(str," -t %d",vnth[ip]); argu += str;  // numero de threads
     sprintf(str," -r %d",vrow[ip]); argu += str;  // ligne de la matrice acq