Changeset 2104 in Sophya

Timestamp:

Jul 16, 2002, 7:01:44 PM (23 years ago)

Author:

cmv

Message:

gestion Info_src en vector<> cmv 16/7/2002

Location:

trunk/ArchTOIPipe

Files:

• ProcWSophya/toi2toi_addsp.cc (modified) (3 diffs)
• ProcWSophya/toi2toi_addsp.h (modified) (3 diffs)
• TestPipes/tsttoi2toi_addsp.cc (modified) (2 diffs)

trunk/ArchTOIPipe/ProcWSophya/toi2toi_addsp.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toi2toi_addsp.cc,v 1.3 2002-07-16 16:38:48 cecile Exp $
+// $Id: toi2toi_addsp.cc,v 1.4 2002-07-16 17:01:36 cmv Exp $
 
 #include "machdefs.h"
@@ -14 +14 @@
 
 ////////////////////////////////////////////////////////////////////////
-Toi2toi_Addsp::Toi2toi_Addsp(Info_src* info, int_4 ns)
-  : src(info), nb_src(ns)
+Toi2toi_Addsp::Toi2toi_Addsp(int_4 ns)
+  : nb_src(ns)
 {
+ Fill_Info_scr();
  SetEquinox();
  SetCoorIn();
@@ -133 +134 @@
 
 //--------------------------------------------------------------------
-//--------------------------------------------------------------------
-//--------------------------------------------------------------------
-//--------------------------------------------------------------------
-//--------------------------------------------------------------------
-//--------------------------------------------------------------------
-void Fill_Info_scr(Info_src* scr, int_4 ns)
+void Toi2toi_Addsp::Fill_Info_scr(void)
 {
-  for (int i=0; i<ns ; i++){
-    scr[i].glon = 80.+i*10.;
-    scr[i].glat = 0.;
-    scr[i].amp  = 1.;
-    scr[i].tau1 = 0.5;
-    scr[i].tau2 = 0.5;
+  if(nb_src<=0) return;
+  for (int i=0; i<nb_src ; i++){
+    Info_src srcloc;
+    srcloc.glon = 80.+i*10.;
+    srcloc.glat = 0.;
+    srcloc.amp  = 1.;
+    srcloc.tau1 = 0.5;
+    srcloc.tau2 = 0.5;
+    src.push_back(srcloc);
   }
 }

trunk/ArchTOIPipe/ProcWSophya/toi2toi_addsp.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toi2toi_addsp.h,v 1.3 2002-07-16 16:38:48 cecile Exp $
+// $Id: toi2toi_addsp.h,v 1.4 2002-07-16 17:01:36 cmv Exp $
 
 #ifndef TOI2MAP_H
@@ -44 +44 @@
 class Toi2toi_Addsp : public TOIProcessor {
 public:
-                 Toi2toi_Addsp(Info_src* info, int_4 ns);
+                 Toi2toi_Addsp(int_4 ns);
   virtual       ~Toi2toi_Addsp();
 
@@ -78 +78 @@
   void Print(::ostream & os);
 
-  static void Fill_Info_scr(Info_src* scr, int_4 ns);
 
 protected:
+  void Fill_Info_scr(void);
 
   unsigned long mTypCoorIn, mTypCoorMap;
   double mActualYear;
-  Info_src* src;
   int_4 nb_src;
+  vector<Info_src> src;
 
   bool mTFlag,mTMin,mTMax;

trunk/ArchTOIPipe/TestPipes/tsttoi2toi_addsp.cc

@@ -19 +19 @@
 
 #include <stdexcept>
+#include <vector>
 
 void usage(void) {
@@ -182 +183 @@
   FITSTOIReader rfitsL(fitsin_lat);
   FITSTOIWriter wfits(fitsout);
-
-  Info_src* scr;
-  Toi2toi_Addsp::Fill_Info_scr(scr,ns);
  
  // TOI Processor
-//   Toi2toi_Addsp toi2t_sp(scr,ns);
+//   Toi2toi_Addsp toi2t_sp(ns);
 //   cout<<"Toi2toi_Addsp created"<<endl;