Changeset 668 in Sophya for trunk/SophyaLib/SkyT/radspec.cc

Timestamp:

Nov 29, 1999, 3:16:10 PM (26 years ago)

Author:

ansari

Message:

Ajout de classes deleguees PPersist et correction integration - Sophie 29/11/99

File:

• trunk/SophyaLib/SkyT/radspec.cc (modified) (7 diffs)

trunk/SophyaLib/SkyT/radspec.cc

@@ -1 +1 @@
 //--------------------------------------------------------------------------
 // File and Version Information:
-//      $Id: radspec.cc,v 1.2 1999-11-20 21:00:50 ansari Exp $
+//      $Id: radspec.cc,v 1.3 1999-11-29 14:16:06 ansari Exp $
 //
 // Description:
@@ -104 +104 @@
 RadSpectra::integratedFlux(double f1, double f2)  const
 {
-    _raypourfinteg = const_cast<RadSpectra *>(this);
-    TrpzInteg I(RadSpectra_fluxFunction , f1, f2);  
-    double val = (double)I;
-    _raypourfinteg = NULL;  // On ne peut pas faire ca avant la destruction de I
-    return(val);        
+//   cout << endl;
+//   cout <<  this->minFreq() << " = " << this->maxFreq() << endl;
+//   cout <<  f1 << " = " << f2 << endl;
+  if(f1 < this->minFreq()) f1 = this->minFreq();
+  if(f2 > this->maxFreq()) f2 = this->maxFreq();
+  _raypourfinteg = const_cast<RadSpectra *>(this);
+  TrpzInteg I(RadSpectra_fluxFunction , f1, f2);  
+  double val = (double)I;
+  _raypourfinteg = NULL;  // On ne peut pas faire ca avant la destruction de I
+  return(val);        
 }
 double 
 RadSpectra::integratedFlux()  const
 {
-  return integratedFlux(_numin, _numax);
+  return integratedFlux(this->minFreq(),this->maxFreq());
 }
 
@@ -129 +134 @@
 RadSpectra::logIntegratedFlux(double f1, double f2)  const
 {
+  if(f1 < this->minFreq()) f1 = this->minFreq();
+  if(f2 > this->maxFreq()) f2 = this->maxFreq();
+
   double f1Log = log10(f1);
   double f2Log = log10(f2);
@@ -161 +169 @@
   _raypourfinteg = const_cast<RadSpectra *>(this);
   _filter = const_cast<SpectralResponse *>(&filter);
+   if(f1 < this->minFreq()) f1 = this->minFreq();
+   if(f2 > this->maxFreq()) f2 = this->maxFreq();
+
   TrpzInteg I(RadSpectra_filteredFlux,f1,f2);
   double val = (double)I;
@@ -185 +196 @@
   double nu = pow(10,tau);
   double flux = _raypourfinteg->flux(nu)*nu;
-  return(flux * _filter->transmission(nu));
+  double result = flux * _filter->transmission(nu);
+  return(result);
 }
 
@@ -192 +204 @@
 RadSpectra::filteredLogIntFlux(SpectralResponse const& filter, double f1, double f2) const
 {
-
-//   double f1Log = log10(f1);
-//   double f2Log = log10(f2);
-//   if(f1Log < -1.e99) f1Log = -1.e99;
-//   if(f2Log > 1.e99)  f2Log = 1.e99;
-//   _rayIntLog = const_cast<RadSpectra *>(this);
-//   TrpzInteg I(RadSpectra_logFluxFunction,f1Log,f2Log);
-//   double value = (double)I * log(10.);
-//   return(value);        
-//   _rayIntLog = NULL;
   
    _raypourfinteg = NULL;
    _filter = NULL;
+   if(f1 < this->minFreq()) f1 = this->minFreq();
+   if(f2 > this->maxFreq()) f2 = this->maxFreq();
+   
    double f1Log = log10(f1);
    double f2Log = log10(f2);
@@ -226 +231 @@
 
 
+
 void
 RadSpectra::Print(ostream& os) const