Changeset 3935 in Sophya for trunk/AddOn

Timestamp:

Dec 29, 2010, 11:17:52 AM (15 years ago)

Author:

cmv

Message:

add option for chanum_1210, cmv 29/12/2010

Location:

trunk/AddOn/TAcq

Files:

• chanum_1210.cc (modified) (7 diffs)
• svv2mtx2_1210.cc (modified) (1 diff)

trunk/AddOn/TAcq/chanum_1210.cc

@@ -18 +18 @@
 #include "nbtrixx.h"
 
-// > chanum_1210 -f 1375.0610351 -o CasA02Dec.csh ../../crt*/PittsDec10/CasA02Dec/chanum_*.ppf
-// > chanum_1210 -f 1375.0610351 -o Crab03Dec.csh ../../crt*/PittsDec10/Crab03Dec/chanum_*.ppf
-// > chanum_1210 -f 1382.5378418 -o Sun03Dec.csh  ../../crt*/PittsDec10/Sun03Dec/chanum_*.ppf
-// > chanum_1210 -f 1390.0146484 -o CasA03Dec.csh ../../crt*/PittsDec10/CasA03Dec/chanum_*.ppf
+// > chanum_1210 -f 1375.0610351 -F 0,8888,5 -o CasA02Dec.csh ../../crt*/PittsDec10/CasA02Dec/chanum_*.ppf
+// > chanum_1210 -f 1375.0610351 -F 0,8888,5 -o Crab03Dec.csh ../../crt*/PittsDec10/Crab03Dec/chanum_*.ppf
+// > chanum_1210 -f 1382.5378418 -F 0,8888,5 -o Sun03Dec.csh  ../../crt*/PittsDec10/Sun03Dec/chanum_*.ppf
+// > chanum_1210 -f 1390.0146484 -F 0,8888,5 -o CasA03Dec.csh ../../crt*/PittsDec10/CasA03Dec/chanum_*.ppf
 
 int decode_numthread(string filein,string& dir);
@@ -30 +30 @@
 {
 cout<<"Usage: chanum_1210 [options] chanum_?.ppf ..."<<endl
-    <<" -f F0MHz : 1ere frequence pour cette acquisition"<<endl
+    <<" -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
     <<" -o fichier.csh : nom du fichier de sortie pour les commandes a lancer"<<endl;
 }
@@ -38 +40 @@
 {
   string outname = "chanum_1210.csh";
+  string selfreq = "0,8888,1", seltime = "0,999999";
   double freq0 = 0.;
 
   char c;
-  while((c = getopt(narg,arg,"hO:o:f:")) != -1) {
+  while((c = getopt(narg,arg,"hO:o:f:F:T:")) != -1) {
     switch (c) {
     case 'f' :
@@ -48 +51 @@
     case 'o' :
       outname = optarg;
+      break;
+    case 'F' :
+      selfreq = optarg;
+      break;
+    case 'T' :
+      seltime = optarg;
       break;
     case 'h' :
@@ -90 +99 @@
 
   // ecriture
+  {
   ofstream ftxt(outname.c_str(), ofstream::out);
   cout<<"writing in "<<outname<<" (is_open="<<ftxt.is_open()<<")"<<endl;
@@ -97 +107 @@
   nvisi = 0;
   for(uint_4 i=0;i<vcode.size();i++) {
-    char str[256];
-    sprintf(str,"${TACQEXE}/svv2mtx2_1210 -T 0,99999 -F 0,8888,1 -f %.7f",freq0);
+    char str[512];
+    sprintf(str,"${TACQEXE}/svv2mtx2_1210 -f %.7f -T %s -F %s"
+            ,freq0,seltime.c_str(),selfreq.c_str());
     string argu = str;
     uint_4 ip = IVcode(i);
@@ -129 +140 @@
   cout<<"nvisi tot="<<nvisi<<", number of duplicate="<<ndupli<<", nvisi="<<nvisi-ndupli<<" / 528"<<endl;
   ftxt << "exit 0" <<endl;
+  }
+
+  // script should be executable
+  string chmod = "chmod a+x "; chmod += outname;
+  system(chmod.c_str());
 
   return 0;

trunk/AddOn/TAcq/svv2mtx2_1210.cc

@@ -229 +229 @@
   MVisi.Info()["dir"] = indir;
   MVisi.Info()["dupli"] = (dupli) ? 1: 0;
-  MVisi.Info()["doconj"] = (doconj) ? 1: 0;
+  MVisi.Info()["isconj"] = (doconj) ? 1: 0;
   MVisi.Info()["TUobs_0"] = tudeb;
   MVisi.Info()["TUobs_N"] = tufin;