Changeset 2099 in Sophya for trunk/ArchTOIPipe/ProcWSophya

Timestamp:

Jul 16, 2002, 5:26:19 PM (23 years ago)

Author:

cecile

Message:

* empty log message *

Location:

trunk/ArchTOIPipe/ProcWSophya

Files:

• toi2toi_addsp.cc (modified) (8 diffs)
• toi2toi_addsp.h (modified) (4 diffs)

trunk/ArchTOIPipe/ProcWSophya/toi2toi_addsp.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toi2toi_addsp.cc,v 1.1 2002-07-16 08:48:06 cecile Exp $
+// $Id: toi2toi_addsp.cc,v 1.2 2002-07-16 15:26:19 cecile Exp $
 
 #include "machdefs.h"
@@ -9 +9 @@
 #include "pexceptions.h"
 #include "ctimer.h"
-#include "toi2map.h"
+#include "toi2toi_addsp.h"
 // La valeur "Pi" doit etre celle de smathconst.h a cause du test sur theta
 #include "smathconst.h"
 
 ////////////////////////////////////////////////////////////////////////
-TOI2Map::TOI2Map()
-  : totnscount(0)
+Toi2toi_Addsp::Toi2toi_Addsp(Info_src* info, int_4 ns)
+  : src(info), nb_src(ns)
 {
  SetEquinox();
@@ -26 +26 @@
 }
 
-TOI2Map::~TOI2Map()
+Toi2toi_Addsp::~Toi2toi_Addsp()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////
-void TOI2Map::Print(::ostream & os)
+void Toi2toi_Addsp::Print(::ostream & os)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////
-void TOI2Map::init() {
-  cout << "TOI2Map::init" << endl;
+void Toi2toi_Addsp::init() {
+  cout << "Toi2toi_Addsp::init" << endl;
+  declareInput("BoloIn"); 
   declareInput("Coord1In");
   declareInput("Coord2In");
-  declareInput("BoloIn"); 
   declareInput("utc"); 
   declareInput("lon"); 
@@ -49 +49 @@
 
 ////////////////////////////////////////////////////////////////////////
-// define SANS_BUFFER
-void TOI2Map::run()
+void Toi2toi_Addsp::run()
 {
 long snb = getMinIn();
@@ -56 +55 @@
 
 if(snb>sne) {
-  cout<<"TOI2Map::run() - Bad sample interval"<<snb<<" , "<<sne<<endl;
-  throw ParmError("TOI2Map::run() - Bad sample interval");
+  cout<<"Toi2toi_Addsp::run() - Bad sample interval"<<snb<<" , "<<sne<<endl;
+  throw ParmError("Toi2toi_Addsp::run() - Bad sample interval");
 }
 if(!checkInputTOIIndex(0) || !checkInputTOIIndex(1) || !checkInputTOIIndex(2)) {
-  cout<<"TOI2Map::run() - Input TOI (Coord1In or Coord2In or BoloIn) not connected! "<<endl;
-  throw ParmError("TOI2Map::run() Output TOI (Coord1In or Coord2In or BoloIn) not connected!");
+  cout<<"Toi2toi_Addsp::run() - Input TOI (Coord1In or Coord2In or BoloIn) not connected! "<<endl;
+  throw ParmError("Toi2toi_Addsp::run() Output TOI (Coord1In or Coord2In or BoloIn) not connected!");
 }
 if( !(mTypCoorIn&TypCoordEq || mTypCoorIn&TypCoordGal) ) {
-  cout<<"TOI2Map::run() - Input Coordinates not Eq or Gal! "<<endl;
-  throw ParmError("TOI2Map::run() - Input Coordinates not Eq or Gal!");
+  cout<<"Toi2toi_Addsp::run() - Input Coordinates not Eq or Gal! "<<endl;
+  throw ParmError("Toi2toi_Addsp::run() - Input Coordinates not Eq or Gal!");
 }
 if( !(mTypCoorMap&TypCoordEq || mTypCoorMap&TypCoordGal) ) {
-  cout<<"TOI2Map::run() - Output Coordinates not Eq or Gal! "<<endl;
-  throw ParmError("TOI2Map::run() - Output Coordinates not Eq or Gal!");
+  cout<<"Toi2toi_Addsp::run() - Output Coordinates not Eq or Gal! "<<endl;
+  throw ParmError("Toi2toi_Addsp::run() - Output Coordinates not Eq or Gal!");
 }
 
@@ -76 +75 @@
 try {
 
-int ii;
-uint_4 mNSnFill=0, mNpixFill=0, NFill[NFILL], BadCoorRange=0;
-for(ii=0;ii<NFILL;ii++) NFill[ii]=0;
 double mjd = MJDfrYear(mActualYear);
 
-cout<<"TOI2Map::run() from "<<snb<<" to "<<sne;
-#ifndef SANS_BUFFER
-int bufsz = 100;
-uint_8* bfgbolo = new uint_8[bufsz];
-double* bbolo   = new double[bufsz];
-double* bc1     = new double[bufsz];
-double* bc2     = new double[bufsz];
-int i0 = -1;
-cout<<" (getData() bufferized)"<<endl;
-#else
-cout<<" (getData() not bufferized)"<<endl;
-#endif
+cout<<"Toi2toi_Addsp::run() from "<<snb<<" to "<<sne;
 
 for(int s=snb;s<=sne;s++) {
   uint_8 fgbolo = 0;
-  double bolo,coord1,coord2;
+  double bolo,bolo_sp,coord1,coord2;
   //              Equatoriales   /   Galactiques
   // coord1,2 =   alpha,delta    /   gLon,gLat
 
-  getData(2,s,bolo,fgbolo);
-  coord1 = getData(0,s);
-  coord2 = getData(1,s);
-  totnscount++;
+  getData(0,s,bolo,fgbolo);
+  coord1 = getData(1,s);
+  coord2 = getData(2,s);
 
   // Comme il n'y a pas de toi en sortie, il faut dire
@@ -129 +113 @@
   }
   ToCoLat(&coord2,TypUniteD);
-
+  bolo_sp=bolo;
+  
   putData(0,s,bolo_sp,fgbolo);
 
@@ -135 +120 @@
  
 
- cout<<"TOI2Map::run(): Fin de boucle sur les sampleNum"<<endl;
+ cout<<"Toi2toi_Addsp::run(): Fin de boucle sur les sampleNum"<<endl;
 
 
 //---------------------------------------------------------
 } catch (PException & exc) {
-  cout<<"TOI2Map: Catched Exception "<<(string)typeid(exc).name()
+  cout<<"Toi2toi_Addsp: Catched Exception "<<(string)typeid(exc).name()
       <<"\n .... Msg= "<<exc.Msg()<<endl;
 }
 
-return;                                                                            
+return;      
 }

trunk/ArchTOIPipe/ProcWSophya/toi2toi_addsp.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toi2toi_addsp.h,v 1.1 2002-07-16 08:48:06 cecile Exp $
+// $Id: toi2toi_addsp.h,v 1.2 2002-07-16 15:26:19 cecile Exp $
 
 #ifndef TOI2MAP_H
@@ -35 +35 @@
 // Si les CoordIn et les CoordMap sont equatoriales -> meme equinoxe!
 
-class TOI2Map : public TOIProcessor {
+struct Info_src 
+{
+  double glon,glat;
+  double azi,elv;
+  double amp,tau1,tau2;
+};
+
+void Fill_Info_scr(Info_src* scr, int_4 ns);
+
+class Toi2toi_Addsp : public TOIProcessor {
 public:
-                 TOI2Map();
-                 //TOI2Map(SphereHEALPix<r_8>* map,SphereHEALPix<r_8>* wmap=NULL);
-  virtual       ~TOI2Map();
+                 Toi2toi_Addsp(Info_src* info, int_4 ns);
+  virtual       ~Toi2toi_Addsp();
 
   virtual void  init(void);
@@ -71 +79 @@
   // Print
   void Print(::ostream & os);
-  inline int_8  ProcessedSampleCount() const { return totnscount; }
 
 protected:
@@ -77 +84 @@
   unsigned long mTypCoorIn, mTypCoorMap;
   double mActualYear;
+  Info_src* src;
+  int_4 nb_src;
 
   bool mTFlag,mTMin,mTMax;
   uint_8 mBadFlag;
   r_8 mValMin,mValMax;
-  int_8 totnscount;   // Nombre total d'echantillon processe
 
 };