Changeset 2390 in Sophya

Timestamp:

May 21, 2003, 6:45:58 PM (22 years ago)

Author:

cecile

Message:

ca compile !

File:

• trunk/ArchTOIPipe/TestPipes/tstringpipe.cc (modified) (8 diffs)

trunk/ArchTOIPipe/TestPipes/tstringpipe.cc

@@ -95 +95 @@
 class AddRing : public RingProcessor {
 public:
-  AddRing(void);
+  AddRing(double coef);
   virtual ~AddRing();
 
@@ -106 +106 @@
 protected:
   int_8 nread,nwrite,totnscount;
+  double Coef;
+  
 };
 
 ////////////////////////////////////////////////////////////////
 // Le code de la classe du processeur (peut etre mis a part)
-AddRing::AddRing(void)
-: nread(0), nwrite(0),totnscount(0)
+AddRing::AddRing(double coef)
+  : nread(0), nwrite(0),totnscount(0),Coef(coef)
 {
 }
@@ -165 +167 @@
  //---------------------------------------------------------
  Ring const *r1,*r2;
- 
 
  for(int k=snb;k<=sne;k++) {
@@ -173 +174 @@
    r2 = getRing(1,k);
    nread++;
-
-
-   putRing(0,k,r1.getData(k)+r2.getData(k));
+ }
+ 
+ Ring r(r1->getNSamples(),r1->getTheta(),r1->getPhi(),r1->getAperture());
+ for(int k=snb;k<=sne;k++) {
+   r.setData(k, r1->getData(k) + Coef * r2->getData(k));   
+   putRing(0,k,&r);
    nwrite++;
  }
@@ -189 +193 @@
 class PrintRing : public RingProcessor {
 public:
-  PrintRing();
+  PrintRing(int toto);
   virtual ~PrintRing();
 
@@ -199 +203 @@
   inline int_8 ProcessedSampleCount() const {return totnscount;}
 protected:
-  int_8 nread,nwrite,totnscount;
+  int_8 nread,nwrite,totnscount,truc;
 };
 
-PrintRing::PrintRing()
-: nread(0), nwrite(0),totnscount(0)
+PrintRing::PrintRing(int toto)
+  : nread(0), nwrite(0),totnscount(0),truc(toto)
 {
 }
@@ -287 +291 @@
  double phi = 0.;
  double aperture = 85.;
+ cout << " CREATIONS PROCESSORS " << endl;
  CreateRing cr1(nsamples,theta,phi,aperture);
  CreateRing cr2(nsamples,theta,phi,aperture);
- AddRing addring();
- PrintRing p();
-
+ AddRing addring(1.);
+ PrintRing p(0);
+
+ cout << " RING PIPES " << endl;
  RingPipe *ring1;
  RingPipe *ring2;
  RingPipe *ring3;
+ cout << " BRANCHEMENTS " << endl;
  cr1.addRingOutput("sortie_bolo", ring1);
  cr2.addRingOutput("sortie_bolo", ring2);
@@ -301 +308 @@
  addring.addRingOutput("sortie_bolo_sum",ring3);
  p.addRingInput("entree_bolo",ring3);
+
+ cout << " PRINT STATUS " << endl;
+ cr1.PrintStatus(cout);
+ cr2.PrintStatus(cout);
+ addring.PrintStatus(cout);
+ p.PrintStatus(cout);
 
  cr1.start();