Changeset 67

Timestamp:

07/19/04 10:58:42 (20 years ago)

Author:

mmarquar

Message:

Fixed various errors arising when compiled without warning suppression.

Location:

trunk/src

Files:

• SDContainer.cc (modified) (4 diffs)
• SDContainer.h (modified) (1 diff)

trunk/src/SDContainer.cc

@@ -187 +187 @@
 }
 
-const Array<Float>& SDContainer::getSpectrum(uInt whichBeam, uInt whichIF) const {
+Array<Float> SDContainer::getSpectrum(uInt whichBeam, uInt whichIF) const {
   Matrix<Float> spectra(nChan_, nPol_);
 
@@ -218 +218 @@
   }
 
-  return spectra;
-}
-
-const Array<uChar>& SDContainer::getFlags(uInt whichBeam, uInt whichIF) const
+  return spectra.copy();
+}
+
+Array<uChar> SDContainer::getFlags(uInt whichBeam, uInt whichIF) const
 {
   Matrix<uChar> flagtra(nChan_, nPol_);
@@ -253 +253 @@
   }
 
-  return flagtra;
-}
-
-const Array<Float>& SDContainer::getTsys(uInt whichBeam, uInt whichIF) const
+  return flagtra.copy();
+}
+
+Array<Float> SDContainer::getTsys(uInt whichBeam, uInt whichIF) const
 {
   Vector<Float> tsys(nPol_);
@@ -281 +281 @@
     o0++;
   }
-  return tsys;
+  return tsys.copy();
 }
 

trunk/src/SDContainer.h

@@ -120 +120 @@
   Bool putFreqMap(const Vector<uInt>& freqs);
   
-  const Array<Float>& getSpectrum(uInt whichBeam, uInt whichIF) const;
-  const Array<uChar>& getFlags(uInt whichBeam, uInt whichIF) const;
-  const Array<Float>& getTsys(uInt whichBeam, uInt whichIF) const;
+  Array<Float> getSpectrum(uInt whichBeam, uInt whichIF) const;
+  Array<uChar> getFlags(uInt whichBeam, uInt whichIF) const;
+  Array<Float> getTsys(uInt whichBeam, uInt whichIF) const;
 
   const Array<Float>& getSpectrum() const { return spectrum_; }