Changeset 3928 in Sophya

Timestamp:

Dec 17, 2010, 4:24:06 PM (15 years ago)

Author:

cmv

Message:

gestion de la conjugaison complexe pour visi # de <E.conj(W)>, cmv 17/12/2010

Location:

trunk/AddOn/TAcq

Files:

• chanum_1210.cc (modified) (5 diffs)
• svv2mtx2_1210.cc (modified) (6 diffs)

trunk/AddOn/TAcq/chanum_1210.cc

@@ -18 +18 @@
 #include "nbtrixx.h"
 
-// > chanum_1210 -f 1375.0610351 -o CasA02Dec.txt crt*/CasA02Dec/chanum_*.ppf
-// > chanum_1210 -f 1375.0610351 -o Crab03Dec.txt crt*/Crab03Dec/chanum_*.ppf
-// > chanum_1210 -f 1382.5378418 -o Sun03Dec.txt  crt*/Sun03Dec/chanum_*.ppf
-// > chanum_1210 -f 1390.0146484 -o CasA03Dec.txt crt*/CasA03Dec/chanum_*.ppf
+// > 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
 
 int decode_numthread(string filein,string& dir);
@@ -31 +31 @@
 cout<<"Usage: chanum_1210 [options] chanum_?.ppf ..."<<endl
     <<" -f F0MHz : 1ere frequence pour cette acquisition"<<endl
-    <<" -o fichier.txt : nom du fichier de sortie pour les commandes a lancer"<<endl;
+    <<" -o fichier.csh : nom du fichier de sortie pour les commandes a lancer"<<endl;
 }
 
@@ -37 +37 @@
 int main(int narg, char* arg[])
 {
-  string outname = "chanum_1210.txt";
+  string outname = "chanum_1210.csh";
   double freq0 = 0.;
 
@@ -92 +92 @@
   ofstream ftxt(outname.c_str(), ofstream::out);
   cout<<"writing in "<<outname<<" (is_open="<<ftxt.is_open()<<")"<<endl;
+  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[128];
-    sprintf(str,"${EXE}/svv2mtx2_1210 -T 0,99999 -F 0,9999,1 -f %.7f",freq0);
+    char str[256];
+    sprintf(str,"${TACQEXE}/svv2mtx2_1210 -T 0,99999 -F 0,8888,1 -f %.7f",freq0);
     string argu = str;
     uint_4 ip = IVcode(i);
@@ -103 +104 @@
     uint_4 vcode_suiv = (i<vcode.size()-1) ? vcode[IVcode(i+1)]: 99999999;
     uint_4 v1 = vcode[ip]/1000, v2 = vcode[ip]%100;
-    if(v1>v2) {swap(v1,v2); argu += " -c";}  // faut-il conjuger ?
     sprintf(str," -t %d",vnth[ip]); argu += str;  // numero de threads
     sprintf(str," -r %d",vrow[ip]); argu += str;  // ligne de la matrice acq
+    // L'acq fait: <v1.conj(v2)>
+    // Si v1 et v2 sont de parites differentes donc de cylindres differents
+    //   on veut toujours avoir une visi <E.conj(W)> cad <impair.conj(pair)>
+    bool doconj = false;
+    if( v1%2==0 && v2%2!=0 ) {argu += " -C"; doconj = true;}  // v1 pair et v2 impair
     //  nom du fichier de sortie avec gestion des duplications
-    if(vcode_suiv==vcode[ip] || vcode_prec!=vcode[ip]) argu += " -D";
-    if(vcode_prec==vcode[ip]) { dupli++; argu += " -D"; }
-        else { ndupli+=dupli; dupli=0; }
+    if(vcode_suiv==vcode[ip] || vcode_prec==vcode[ip]) argu += " -D";
+    if(vcode_prec==vcode[ip]) {
+      dupli++;
+      if(i==vcode.size()-1) ndupli += dupli;
+    } else {
+      ndupli += dupli;
+      dupli = 0;
+    }
     sprintf(str," -o visi%d_%02d_%02d.ppf",dupli,v1,v2); argu += str;
     argu += " "; argu += vdir[ip];  // repertoire des fichiers acq
     ftxt << argu <<endl;
     nvisi++;
-    cout<<i<<" "<<ip<<" "<<vcode[ip]<<" "<<v1<<","<<v2<<" th="<<vnth[ip]<<" ro="<<vrow[ip]<<" du="<<dupli<<" "<<vdir[ip]<<endl;
+    cout<<i<<" "<<ip<<" "<<vcode[ip]<<" "<<v1<<","<<v2<<" th="<<vnth[ip]<<" ro="<<vrow[ip]
+        <<" du="<<dupli<<" cj="<<doconj<<" "<<vdir[ip]<<endl;
   }
   cout<<"nvisi tot="<<nvisi<<", number of duplicate="<<ndupli<<", nvisi="<<nvisi-ndupli<<" / 528"<<endl;
+  ftxt << "exit 0" <<endl;
 
- return 0;
+  return 0;
 }
 

trunk/AddOn/TAcq/svv2mtx2_1210.cc

@@ -24 +24 @@
 cout<<"svv2mtx2_1012 [options] dir : lecture des fichiers acq de Pittsburgh Dec 2010"<<endl
     <<" dir : repertoire ou se trouvent les fichiers d'acq"<<endl
+    <<" -C : compute and store the complexe conjugated visi"<<endl
     <<" -D : visi is a duplicated one"<<endl
     <<" -o visi.ppf : nom du ficher ppf pour ecrire la visi temps-frequence"<<endl
@@ -40 +41 @@
   string outname = "";
   int numthread = -1, numrow = -1;
-  bool dupli = false;
+  bool dupli = false, doconj = false;
   double freq0 = 0.;
   int ifilmin=0, ifilmax=99999;
@@ -47 +48 @@
 
   char c;
-  while((c = getopt(narg,arg,"hDo:t:r:f:T:F:")) != -1) {
+  while((c = getopt(narg,arg,"hDCo:t:r:f:T:F:")) != -1) {
     switch (c) {
     case 'D' :
       dupli = true;
       break;
+    case 'C' :
+      doconj = true;
+      break;
     case 'o' :
       outname = optarg;
@@ -83 +87 @@
   cout<<"numrow="<<numrow<<endl;  if(numrow<0) return -2;
   cout<<"dupli="<<(int)dupli<<endl;
+  cout<<"doconj="<<(int)doconj<<endl;
   cout<<"outname="<<outname<<endl; if(outname.size()<=0) return -2;
   cout<<"indir="<<indir<<endl;
@@ -204 +209 @@
       Npaqsum(ntimefill) = nf * npaqsum;
       MVisi(ntimefill,i) /= double(Npaqsum(ntimefill));
+      if(doconj) MVisi(ntimefill,i) = conj(MVisi(ntimefill,i));
     }
     ntimefill++;
@@ -223 +229 @@
   MVisi.Info()["dir"] = indir;
   MVisi.Info()["dupli"] = (dupli) ? 1: 0;
+  MVisi.Info()["doconj"] = (doconj) ? 1: 0;
   MVisi.Info()["TUobs_0"] = tudeb;
   MVisi.Info()["TUobs_N"] = tufin;