Changeset 3652 in Sophya for trunk/AddOn/TAcq/mcrd.cc

Timestamp:

Jun 15, 2009, 10:57:12 AM (16 years ago)

Author:

ansari

Message:

Ajout calcul histogramme des valeurs echantillons en temps, Reza 15/06/2009

File:

• trunk/AddOn/TAcq/mcrd.cc (modified) (13 diffs)

trunk/AddOn/TAcq/mcrd.cc

@@ -61 +61 @@
 static int GPaqSz=16424;
 static double LossRate=0.1;
+
+static bool fg4c=false;  // true -> 4 channels (2 fibers)
+static bool fgrdfits=true;  // false -> Don't read fits files, generate paquets
+static bool fgnotrl=false;   // true -> fichier fits SANS Trailer de frame (< mai 2009)
+static bool fghist=false;   // true -> histo des valeurs des time sample
+
 // ----
 int Usage(bool fgshort=true);
 // Pour traitement (calcul FFT et visibilites (ProcA) 1 fibre, 2 voies RAW)
-int Proc1FRawA(string& outname, string& inpath, int jf1, int jf2, bool fgnotrl=false, 
-               bool fgrdfile=true);
+int Proc1FRawA(string& outname, string& inpath, int jf1, int jf2);
 // Pour traitement (calcul FFT et visibilites (ProcA,ProcB) 2 fibre, 4 voies RAW)
-int Proc2FRawAB(string& outname, string& path1, string& path2, int jf1, int jf2, 
-                bool fgnotrl=false, bool fgrdfile=true);
+int Proc2FRawAB(string& outname, string& path1, string& path2, int jf1, int jf2);
 
 //----------------------------------------------------
@@ -82 +86 @@
   try {
     string act = arg[1];
-    bool fg4c=false;  // true -> 4 channels (2 fibers)
-    bool fgrdfits=true;  // false -> Don't read fits files, generate paquets
-    bool fgnotrl=false;   // true -> fichier fits SANS Trailer de frame (< mai 2009)
+    fg4c=false;  // true -> 4 channels (2 fibers)
+    fgrdfits=true;  // false -> Don't read fits files, generate paquets
+    fgnotrl=false;   // true -> fichier fits SANS Trailer de frame (< mai 2009)
+    fghist=false;   // true -> histo des valeurs des time sample
     if (act.substr(0,2)=="-4") fg4c=true;
-    if (act.substr(2)=="g")  fgrdfits=false;
-    else if (act.substr(2)=="nt")  fgnotrl=true;
+    if (act.length()>2) {
+      for(size_t ks=2; ks<act.length(); ks++) {
+        if(act[ks]=='g') fgrdfits=false;
+        else if(act[ks]=='n') fgnotrl=true; 
+        else if(act[ks]=='h') fghist=true; 
+      }
+    }
     if (fg4c && (narg<6)) return Usage(true);
 
@@ -107 +117 @@
     ResourceUsage resu;
     if (fg4c) 
-      rc =  Proc2FRawAB(outname, inpath, inpath2, imin, imax, fgnotrl, fgrdfits); 
+      rc =  Proc2FRawAB(outname, inpath, inpath2, imin, imax); 
     else 
-      rc =  Proc1FRawA(outname, inpath, imin, imax, fgnotrl, fgrdfits); 
+      rc =  Proc1FRawA(outname, inpath, imin, imax); 
     cout << resu ; 
   }
@@ -135 +145 @@
 
 // Pour traitement (calcul FFT et visibilites (ProcA) 1 fibre, 2 voies RAW)
-int Proc1FRawA(string& outname, string& inpath, int imin, int imax, 
-               bool fgnotrl, bool fgrdfile)
+int Proc1FRawA(string& outname, string& inpath, int imin, int imax)
 {
   vector<string> infiles;
@@ -146 +155 @@
   uint_4 nmaxz;
   uint_4 paqsz, npaqf;
-  if (fgrdfile) {
+  if (fgrdfits) {
     DecodeMiniFitsHeader(infiles[0],paqsz, npaqf, fgnotrl); 
     nmaxz = infiles.size()*npaqf/NPaqinZone;
@@ -167 +176 @@
 
   outname += "/Ch12";
-  BRProcARaw2C proc(mmgr, outname, NMean, nmaxz, fgnotrl);
+  BRProcARaw2C proc(mmgr, outname, NMean, nmaxz, fghist, fgnotrl);
 
   cout << " mcrd/Proc1FRawA: Starting threads (reader, proc) ... " << endl;
 
-  if (fgrdfile) reader.start();
+  if (fgrdfits) reader.start();
   else pcird.start();
 
@@ -177 +186 @@
   sleep(1);
   cout << " mcrd/Proc1FRawA: Waiting for reader thread to finish ... " << endl;
-  if (fgrdfile) reader.join();
+  if (fgrdfits) reader.join();
   else pcird.join();
   cout << " mcrd/Proc1FRawA: Reader finished, waiting for process thread to finish ... " << endl;
@@ -189 +198 @@
 
 // Pour traitement (calcul FFT et visibilites (ProcA) 1 fibre, 2 voies RAW)
-int Proc2FRawAB(string& outname, string& path1, string& path2, int imin, int imax, 
-               bool fgnotrl, bool fgrdfile)
+int Proc2FRawAB(string& outname, string& path1, string& path2, int imin, int imax) 
 {
   vector<string> infiles1;
@@ -203 +211 @@
   uint_4 nmaxz;
   uint_4 paqsz, npaqf;
-  if (fgrdfile) {
+  if (fgrdfits) {
     DecodeMiniFitsHeader(infiles1[0],paqsz, npaqf, fgnotrl); 
     nmaxz = infiles1.size()*npaqf/NPaqinZone;
@@ -235 +243 @@
   string outname1 = outname;
   outname1 += "/Ch12";
-  BRProcARaw2C proc1(mmgr1, outname1, NMean, nmaxz, fgnotrl);
+  BRProcARaw2C proc1(mmgr1, outname1, NMean, nmaxz, fghist, fgnotrl);
   string outname2 = outname;
   outname2 += "/Ch34";
-  BRProcARaw2C proc2(mmgr2, outname2, NMean, nmaxz, fgnotrl,2);
+  BRProcARaw2C proc2(mmgr2, outname2, NMean, nmaxz, fghist, fgnotrl,2);
   string outname12 = outname;
   outname12 += "/Ch1234";
@@ -245 +253 @@
   cout << " mcrd/Proc2FRawAB: Starting threads (reader1,2, procA1,2, procAB) ... " << endl;
 //  cout << "[1]--- CR to continue ..." << endl;   char ans[32]; gets(ans); 
-  if (fgrdfile) { 
+  if (fgrdfits) { 
     reader1.start();
     reader2.start();
@@ -260 +268 @@
   sleep(1);
   cout << " mcrd/Proc2FRawAB: Waiting for reader threads to finish ... " << endl;
-  if (fgrdfile) { 
+  if (fgrdfits) { 
     reader1.join();
     reader2.join();
@@ -291 +299 @@
     return 1;
   }
-  cout << " ACT= -2 , -2g , -2nt -> 1 fiber, 2 raw channel processing (ProcA)\n"
-       << " ACT= -4 , -4g , -4g , -4nt -> 2 fibers, 4 raw channels (ProcA, ProcB)\n"
-       << "   nt (notrl) -> FITS files without frame trailer \n" 
-       << "   g (generate paquets) -> generate paquets instead of reading fits files" <<endl; 
+  cout << " ACT= -2[ghn] -> 1 fiber, 2 raw channel processing (ProcA)\n"
+       << " ACT= -4[ghn] -> 2 fibers, 4 raw channels (ProcA, ProcB)\n"
+       << "   n (notrl) -> FITS files without frame trailer \n" 
+       << "   g (generate paquets) -> generate paquets instead of reading fits files\n"
+       << "   h (time sample histograms) -> compute time sample histograms also \n" 
+       << "   Example: ACT = -2h  1 fiber, 2 raw channels and compute time sample histograms" <<endl; 
   cout << " OutPath : Output directory name " << endl;
   cout << " InPath [InPath2] Imin,Imax: Input fits files directory name(s)\n"