Changeset 2361 in Sophya for trunk/ArchTOIPipe/ProcWSophya

Timestamp:

Apr 17, 2003, 3:47:34 PM (22 years ago)

Author:

cecile

Message:

nouveaux tuyaux de ring : theta, phi puis Nsamples mesures

Location:

trunk/ArchTOIPipe/ProcWSophya

Files:

• ring2cout.cc (modified) (3 diffs)
• ring2cout.h (modified) (3 diffs)
• toi2ring.cc (modified) (3 diffs)

trunk/ArchTOIPipe/ProcWSophya/ring2cout.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: ring2cout.cc,v 1.4 2003-04-04 14:17:37 cecile Exp $
+// $Id: ring2cout.cc,v 1.5 2003-04-17 13:47:34 cecile Exp $
 
 #include "toimanager.h"
@@ -33 +33 @@
 void Ring2cout::init() {
   cout << "Ring2cout::init" << endl;
-  declareInput("Theta");     // input  index 0
-  declareInput("Phi");     // input  index 1
-  declareInput("Phase");     // input  index 2
+  declareInput("Phase");     // input  index 0
 }
 
@@ -46 +44 @@
 
   cout << " ring " << Nrings << " ns " << Nsamples<< endl;
-  double ctheta[Nsamples],cphi[Nsamples],val[Nsamples];
+  double val[Nsamples];
   for (int k=0; k<Nrings; k++) {
     
-    getData(0,k*Nsamples,Nsamples,ctheta);
-    getData(1,k*Nsamples,Nsamples,cphi);
-    getData(2,k*Nsamples,Nsamples,val);
+    double theta= getData(0,k*(Nsamples+2)+0);
+    double phi  = getData(0,k*(Nsamples+2)+1);
+    cout << Nrings << " " << k <<" " <<theta <<" " <<phi<< endl;
+    getData(0,k*(Nsamples+2)+2,Nsamples,val);
     mSnRead ++;
     
     for (int i=0; i< Nsamples;i++)
-      cout << Nrings << " " << k <<" " << i <<" " << ctheta[i] << " " << cphi[i]<< " " << val[i]<< endl;
-    totnscount+=Nsamples;
+      cout <<  i << " " << val[i]<< endl;
+    totnscount+=Nsamples+2;
     
   }

trunk/ArchTOIPipe/ProcWSophya/ring2cout.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: ring2cout.h,v 1.2 2003-03-26 09:48:53 cecile Exp $
+// $Id: ring2cout.h,v 1.3 2003-04-17 13:47:34 cecile Exp $
 
 #ifndef TOI2RING_H
@@ -17 +17 @@
 class Ring2cout : public TOIProcessor {
 public:
-                 Ring2cout(long n);
+                 Ring2cout(long ns,long nr);
   virtual       ~Ring2cout();
 
   inline void setNSamples( long n=1024)
               {Nsamples = n;}
+
+  inline void setNRings( long n=1)
+              {Nrings = n;}
 
   virtual void  init(void);
@@ -31 +34 @@
   void Print(::ostream & os);
   inline long   ProcessedSampleCount() const { return totnscount; }
-  inline long   ProcessedRingCount() const { return nRings; }
+  inline long   ProcessedRingCount() const { return Nrings; }
 
 protected:
   long Nsamples;
   long totnscount;
-  long nRings;
+  long Nrings;
   
 };

trunk/ArchTOIPipe/ProcWSophya/toi2ring.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toi2ring.cc,v 1.5 2003-03-28 16:06:17 cecile Exp $
+// $Id: toi2ring.cc,v 1.6 2003-04-17 13:47:34 cecile Exp $
 
 #include "toimanager.h"
@@ -33 +33 @@
   cout << "Toi2RING::init" << endl;
   declareInput("Theta");     // input  index 0
-  declareInput("Phi");     // input  index 1
+  declareInput("Phi");       // input  index 1
   declareInput("Phase");     // input  index 2
   declareInput("Value");     // input  index 3
-  declareOutput("CircTheta");   // output index 0
-  declareOutput("CircPhi");   // output index 1
-  declareOutput("Rvalue");   // output index 2
-  declareOutput("WCircTheta");   // output index 3
-  declareOutput("WCircPhi");   // output index 4
-  declareOutput("WRvalue");   // output index 5
+  declareOutput("Rvalue");   // output index 0
+  declareOutput("WRvalue");  // output index 1
 }
 
@@ -91 +87 @@
     //  if (k==sne) { wfits.setNRings(Nrings); wwfits.setNRings(Nrings);}
     
+    putData(0,Nrings*(Nsamples+2)+0,ctheta_prec);
+    putData(1,Nrings*(Nsamples+2)+0,ctheta_prec);
+    putData(0,Nrings*(Nsamples+2)+1,cphi_prec);
+    putData(1,Nrings*(Nsamples+2)+1,cphi_prec);
+    cout << Nsamples << " !@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" << endl;
     for(i=0;i<Nsamples;i++) {
       if(wr[i] == 0) r[i] = -999999.;
       else r[i] /= wr[i];
       
-      putData(0,Nrings*Nsamples+i,ctheta_prec);
-      putData(1,Nrings*Nsamples+i,cphi_prec);
-      putData(2,Nrings*Nsamples+i,r[i]);
-      putData(3,Nrings*Nsamples+i,ctheta_prec);
-      putData(4,Nrings*Nsamples+i,cphi_prec);
-      putData(5,Nrings*Nsamples+i,wr[i]);
+      putData(0,Nrings*(Nsamples+2)+2+i,r[i]);
+      putData(1,Nrings*(Nsamples+2)+2+i,wr[i]);
       wr[i]=0;
       r[i]=0.;