Changeset 2319 in Sophya for trunk/ArchTOIPipe

Timestamp:

Jan 30, 2003, 6:19:38 PM (23 years ago)

Author:

cecile

Message:

* empty log message *

Location:

trunk/ArchTOIPipe

Files:

• ProcWSophya/toi2ring.cc (modified) (4 diffs)
• TestPipes/tsttoi2ring.cc (modified) (2 diffs)

trunk/ArchTOIPipe/ProcWSophya/toi2ring.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toi2ring.cc,v 1.1 2003-01-29 15:24:42 cecile Exp $
+// $Id: toi2ring.cc,v 1.2 2003-01-30 17:19:25 cecile Exp $
 
 #include "toimanager.h"
@@ -32 +32 @@
 void Toi2RING::init() {
   cout << "Toi2RING::init" << endl;
+  declareInput("Theta");     // input  index 0
+  declareInput("Phi");     // input  index 0
   declareInput("Phase");     // input  index 0
   declareInput("Value");     // input  index 1
+  declareOutput("CircTheta");   // output index 0
+  declareOutput("CircPhi");   // output index 0
   declareOutput("Rvalue");   // output index 0
-  declareOutput("WRvalue");   // output index 1
+  //  declareOutput("WRvalue");   // output index 1
 }
 
@@ -64 +68 @@
 
  
+ 
 for(int k=snb;k<=sne;k++) {
 
   uint_8 flg = 0;
-  double phi = getData(0,k);
-  double val = getData(1,k);
+  double ctheta = getData(0,k);
+  double cphi = getData(1,k);
+  double phi = getData(2,k);
+  double val = getData(3,k);
   mSnRead++;
 
@@ -75 +82 @@
   wr[i]++;
 
+  cout << phi << " " << phi_prec << " " << Nrings <<endl;
+  
   if(phi < phi_prec){
     
+    putData(0,Nrings,ctheta);
+    putData(1,Nrings,cphi);
+
     for(i=0;i<Nsamples;i++) {
       if(wr[i] == 0) r[i] = -999999.;
-      putData(0,Nrings*Nsamples+i,r[i]);
-      putData(1,Nrings*Nsamples+i,wr[i]);
+      cout << i << " " << Nrings << " " << Nsamples << " " << ctheta << " " << cphi << " " << r[i]<< endl;
+      putData(2,Nrings*Nsamples+i,r[i]);
+      //      putData(1,Nrings*Nsamples+i,wr[i]);
       wr[i]=0;
-      r[i]=-999999;
+      r[i]=0.;
     }
     

trunk/ArchTOIPipe/TestPipes/tsttoi2ring.cc

@@ -32 +32 @@
 
 //-- Decodage arguments
- bool fgsegmented = true;
+bool fgsegmented = true;
 int wsize = 512;
-char *label_phase = "BOLOMUVC_26",  *label_bolomuv = "BOLOMUVC_26";
+char *label_phase = "PHASE",  *label_bolomuv = "BOLOMUVC_26";
+char *label_theta = "THETA",  *label_phi = "PHI";
 bool snimplicit = false;
 
@@ -89 +90 @@
  cout << label_phase <<endl;
  
+ plombier.Connect(rfitsp,label_theta,m2ring,"Theta");
+ plombier.Connect(rfitsp,label_phi,m2ring,"Phi");
  plombier.Connect(rfitsp,label_phase,m2ring,"Phase");
  plombier.Connect(rfitsv,label_bolomuv,m2ring,"Value");
  cout<<"file out "<<fitsout_value<< endl;
+
+ plombier.Connect(m2ring,"CircTheta",wfits,"CircTheta");
+ plombier.Connect(m2ring,"CircPhi",wfits,"CircPhi");
  plombier.Connect(m2ring,"Rvalue",wfits,"signal");
- plombier.Connect(m2ring,"WRvalue",wwfits,"signal");
+
+//   plombier.Connect(m2ring,"CircTheta",wwfits,"CircTheta");
+//   plombier.Connect(m2ring,"CircPhi",wwfits,"CircPhi");
+//   plombier.Connect(m2ring,"WRvalue",wwfits,"signal");