Changeset 1325 for trunk/src

Timestamp:

04/12/07 12:07:38 (17 years ago)

Author:

mar637

Message:

Changes to use casacore instead of casa_asap/aips++\nAdded atnf PKSIO library snapshot to external and linking against this local copy

Location:

trunk/src

Files:

• MathUtils.cpp (modified) (1 diff)
• MathUtils.h (modified) (1 diff)
• MathUtils2.cpp (deleted)
• SConscript (modified) (1 diff)
• Scantable.cpp (modified) (3 diffs)
• Templates.cpp (deleted)

trunk/src/MathUtils.cpp

@@ -100 +100 @@
   return out;
 }
+
+void mathutil::hanning(Vector<Float>& out, Vector<Bool>& outmask,
+                       const Vector<Float>& in, const Vector<Bool>& mask,
+                       Bool relaxed, Bool ignoreOther) {
+  Vector< Vector<Float> > weights(8);
+  Vector<Float> vals(3);
+  vals = 0.0;weights[0] = vals;// FFF
+  vals[0] = 1.0; vals[1] = 0.0; vals[2] = 0.0; weights[1] = vals;// TFF
+  vals[0] = 0.0; vals[1] = 1.0; vals[2] = 0.0; weights[2] = vals;// FTF
+  vals[0] = 1.0/3.0; vals[1] = 2.0/3.0; vals[2] = 0.0; weights[3] = vals;// TTF
+  vals[0] = 0.0; vals[1] = 0.0; vals[2] = 1.0;weights[4] = vals;// FFT
+  vals[0] = 0.5; vals[1] = 0.0; vals[2] = 0.5; weights[5] = vals;// TFT
+  vals[0] = 0.0; vals[1] = 2.0/3.0; vals[2] = 1.0/3.0; weights[6] = vals;// FTT
+  vals[0] = 0.25; vals[1] = 0.5; vals[2] = 0.25; weights[7] = vals;// TTT
+  // Chris' case
+  Vector<Bool> weighted(8);
+  if (relaxed) {
+    weighted = False;
+    weighted[7] = True;
+
+  } else {
+    weighted = True;
+    weighted[0] = False;
+  }
+
+  out.resize(in.nelements());
+  outmask.resize(mask.nelements());
+  // make special case for first and last
+  /// ...here
+  // loop from 1..n-2
+  out.resize(in.nelements());
+  out[0] = in[0];out[out.nelements()-1] = in[in.nelements()-1];
+  outmask.resize(mask.nelements());
+  outmask = False;
+  uInt m;Vector<Float>* w;
+  for (uInt i=1; i < out.nelements()-1;++i) {
+    m = mask[i-1] + 2*mask[i] + 4*mask[i+1];
+    w = &(weights[m]);
+    if (weighted[m]) {
+      out[i] = (*w)[0]*in[i-1] + (*w)[1]*in[i] + (*w)[2]*in[i+1];
+      outmask[i] = True;
+    } else { // mask it
+      out[i] = in[i];//use arbitrary value
+      outmask[i] = False;
+    }
+  }
+}

trunk/src/MathUtils.h

@@ -50 +50 @@
  * @param ignoreOther drop every second channel (NYI)
  */
-template <class T>
-void hanning(casa::Vector<T>& out, casa::Vector<casa::Bool>& outmask,
-             const casa::Vector<T>& in, const casa::Vector<casa::Bool>& mask,
+void hanning(casa::Vector<casa::Float>& out, 
+             casa::Vector<casa::Bool>& outmask,
+             const casa::Vector<casa::Float>& in, 
+             const casa::Vector<casa::Bool>& mask,
              casa::Bool relaxed=casa::False,
              casa::Bool ignoreOther=casa::False);

trunk/src/SConscript

@@ -10 +10 @@
 for pf in pycpps: cpps.remove(pf)
 
-casalibd = os.path.join(myenv['CASAROOT'],myenv['CASAARCH'],'lib')
-
 # location of libcasav.a
 myenv.Prepend( LIBPATH = ['#/build'] )
-myenv.Install('#build', os.path.join(casalibd, 'libwcs.a'))
 myenv['SHLIBPREFIX']=""   #gets rid of lib prefix
-
+myenv.Append(CCFLAGS=["-DWCSLIB_GETWCSTAB"])
 # need to create library here to fool  scons linker
-casav = myenv.StaticLibrary(target = "casav", source = os.path.join(casalibd, 'version.o'))
 libasap =  myenv.StaticLibrary(target = "asap", source = cpps)
 myenv.Prepend( LIBS =  ['asap'] )
 
 # Finally create the library for the module
-so = myenv.SharedLibrary( target = "_asap", source = pycpps )
+so = myenv.LoadableModule( target = "_asap.so", source = pycpps, SHLIBSUFFIX="" )
 #test = myenv.Program("test", cpps)
 Return("so")

trunk/src/Scantable.cpp

@@ -22 +22 @@
 #include <casa/Arrays/ArrayLogical.h>
 #include <casa/Arrays/ArrayAccessor.h>
+#include <casa/Arrays/Vector.h>
 #include <casa/Arrays/VectorSTLIterator.h>
-#include <casa/Arrays/Vector.h>
 #include <casa/BasicMath/Math.h>
 #include <casa/BasicSL/Constants.h>
@@ -42 +42 @@
 #include <tables/Tables/ExprNode.h>
 #include <tables/Tables/TableRecord.h>
+#include <casa/Quanta/MVTime.h>
+#include <casa/Quanta/MVAngle.h>
+#include <measures/Measures/MeasRef.h>
+#include <measures/Measures/MeasTable.h>
+// needed to avoid error in .tcc
+#include <measures/Measures/MCDirection.h>
+//
+#include <measures/Measures/MDirection.h>
 #include <measures/Measures/MFrequency.h>
 #include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MeasTable.h>
-#include <measures/Measures/MeasRef.h>
 #include <measures/TableMeasures/TableMeasRefDesc.h>
 #include <measures/TableMeasures/TableMeasValueDesc.h>
@@ -51 +57 @@
 #include <measures/TableMeasures/ScalarMeasColumn.h>
 #include <coordinates/Coordinates/CoordinateUtil.h>
-#include <casa/Quanta/MVTime.h>
-#include <casa/Quanta/MVAngle.h>
 
 #include "Scantable.h"