Changeset 4066 in Sophya

Timestamp:

Apr 27, 2012, 12:54:12 AM (13 years ago)

Author:

ansari

Message:

Ajout gestion de niveau d'impression globale pour les cartes du module SkyMap ds pixelmap.h et prise en compte du niveau pour les prints ds Resize des SphericalMaps (fait en janv 2012 ?), Reza 27/04/2012

Location:

trunk/SophyaLib/SkyMap

Files:

• pixelmap.h (modified) (1 diff)
• skymapinit.cc (modified) (1 diff)
• sphereecp.cc (modified) (1 diff)
• spherehealpix.cc (modified) (1 diff)
• spherethetaphi.cc (modified) (2 diffs)
• sphericalmap.h (modified) (2 diffs)

trunk/SophyaLib/SkyMap/pixelmap.h

@@ -27 +27 @@
 \endverbatim
 */
+
+//! Set global print level for all pixel maps
+void PixelMap_SetGlobalPrintLevel(int_4 lev=0); 
+//! Get global print level for all pixel maps 
+int_4 PixelMap_GetGlobalPrintLevel(); 
 
 template<class T>

trunk/SophyaLib/SkyMap/skymapinit.cc

@@ -28 +28 @@
 //   V=1.62 , Aou 2007: correction ds LocalMap::PixToSphereC() 
 //   V=1.7  , Aou 2010 
-#define MOD_VERS   1.70
+//   V=1.72 , Avr 2012 
+#define MOD_VERS   1.72
 
 SkyMapInitiator::SkyMapInitiator()

trunk/SophyaLib/SkyMap/sphereecp.cc

@@ -312 +312 @@
 void  SphereECP<T>::Resize(int_4 m)
 {
-  if ( (m <= 0) || ( m == _pixels.SizeY()) ) { 
-    cout << " SphereECP<T>::Resize(int_4 " << m << ") m<0 ou m=NTheta - Ne fait rien " << endl;
+  if ( (m <= 0) || ( m == _pixels.SizeY()) ) {
+    if (PixelMap_GetGlobalPrintLevel()>0)  
+      cout << " SphereECP<T>::Resize(int_4 " << m << ") m<0 ou m=NTheta - Ne fait rien " << endl;
     return;
   }
   int mphi = m;
   if (_pixels.Size() > 0)  mphi = m*_pixels.SizeX()/_pixels.SizeY();
-  cout << " SphereECP<T>::Resize(" << m 
-       << ") -> _pixels.Resize(" << mphi << "," << m << ")" << endl; 
+  if (PixelMap_GetGlobalPrintLevel()>0) 
+    cout << " SphereECP<T>::Resize(" << m 
+         << ") -> _pixels.Resize(" << mphi << "," << m << ")" << endl; 
   sa_size_t sz[5] = {0,0,0,0,0};
   sz[0] = mphi;  sz[1] = m;

trunk/SophyaLib/SkyMap/spherehealpix.cc

@@ -208 +208 @@
 {
   if ((m <= 0 && nSide_ > 0))  {
-    cout << "SphereHEALPix<T>::Resize(m) with m<=0, NOT resized" << endl;
+    if (PixelMap_GetGlobalPrintLevel()>0) 
+      cout << "SphereHEALPix<T>::Resize(m) with m<=0, NOT resized" << endl;
     return;
   }

trunk/SophyaLib/SkyMap/spherethetaphi.cc

@@ -8 +8 @@
 #include "spherethetaphi.h"
 
+//----- global print level for spherical maps -----
+static int_4  pixel_map_prt_lev_ = 0;
+// Set global print level 
+void SOPHYA::PixelMap_SetGlobalPrintLevel(int_4 lev)
+{ pixel_map_prt_lev_=lev; }
+// Get global print level
+int_4 SOPHYA::PixelMap_GetGlobalPrintLevel()
+{ return pixel_map_prt_lev_; }
+//----------------------------------------------------
 
 /*!
@@ -124 +133 @@
 {
   if ((m <= 0) && (NTheta_ > 0) ) {
-    cout << "SphereThetaPhi<T>::Resize(m) with m<=0 - NOT resized" << endl;
+    if (PixelMap_GetGlobalPrintLevel()>0) 
+      cout << "SphereThetaPhi<T>::Resize(m) with m<=0 - NOT resized" << endl;
     return;
   }

trunk/SophyaLib/SkyMap/sphericalmap.h

@@ -33 +33 @@
   
 public :
-
 SphericalMap() {};
 virtual  ~SphericalMap() {};
@@ -64 +63 @@
 */
 virtual T*   GetThetaSliceDataPtr(int_4 sliceIndex) { return NULL; }
+
+protected:
+  static int_4 prt_lev_;  //!< Print level
 };