Changeset 125 for trunk/src/SDTemplates.cc

Timestamp:

12/10/04 14:54:54 (20 years ago)

Author:

mar637

Message:

Moved to casa namespace.
Adjusted the copyright to be ATNF.

File:

• trunk/src/SDTemplates.cc (modified) (5 diffs)

trunk/src/SDTemplates.cc

@@ -3 +3 @@
 //#---------------------------------------------------------------------------
 //# Copyright (C) 2004
-//# Malte Marquarding, ATNF
+//# ATNF
 //#
 //# This program is free software; you can redistribute it and/or modify it
@@ -29 +29 @@
 //# $Id:
 //#---------------------------------------------------------------------------
+#include "SDMemTable.h"
+
+#include <casa/aips.h>
+#include <casa/namespace.h>
 #include <casa/Containers/Block.h>
 #include <casa/Exceptions/Error.cc>
@@ -35 +39 @@
 #include <casa/Utilities/CountedPtr2.cc>
 #include <casa/Utilities/Copy.cc>
-#include "SDMemTable.h"
 
 namespace asap {
-  template class CountedConstPtr<SDMemTable>;
-  template class CountedPtr<SDMemTable>;
-  template class PtrRep<SDMemTable>;
-  template class SimpleCountedConstPtr<SDMemTable>;
-  template class SimpleCountedPtr<SDMemTable>;
-  template class Block<CountedPtr<SDMemTable> >;
+  template class casa::CountedConstPtr<SDMemTable>;
+  template class casa::CountedPtr<SDMemTable>;
+  template class casa::PtrRep<SDMemTable>;
+  template class casa::SimpleCountedConstPtr<SDMemTable>;
+  template class casa::SimpleCountedPtr<SDMemTable>;
+  template class casa::Block<CountedPtr<SDMemTable> >;
 }
-template void objcopy(CountedPtr<asap::SDMemTable> *, CountedPtr<asap::SDMemTable> const *, uInt);
-template void objmove(CountedPtr<asap::SDMemTable> *, CountedPtr<asap::SDMemTable> const *, uInt);
-template void objset(CountedPtr<asap::SDMemTable> *, CountedPtr<asap::SDMemTable>, uInt);
+
+template void objcopy<CountedPtr<asap::SDMemTable> >(CountedPtr<asap::SDMemTable> *, CountedPtr<asap::SDMemTable> const *, uInt);
+template void objmove<CountedPtr<asap::SDMemTable> >(CountedPtr<asap::SDMemTable> *, CountedPtr<asap::SDMemTable> const *, uInt);
+template void objset<CountedPtr<asap::SDMemTable> >(CountedPtr<asap::SDMemTable> *, CountedPtr<asap::SDMemTable>, uInt);
 
 #include <casa/Arrays/ArrayLogical.cc>
@@ -61 +65 @@
 #include <casa/Utilities/PtrHolder.cc>
 #include <lattices/Lattices/Lattice.h>
-#include "MathUtils.cc"
 
-template void convertArray(Array<Bool> &, Array<uChar> const &);
-template void convertArray(Array<uChar> &, Array<Bool> const &);
-template LogicalArray operator!=(Array<Float> const &, Float const &);
-template LogicalArray operator==(Array<Float> const &, Float const &);
-template LogicalArray operator>(Array<Float> const &, Float const &);
-template LogicalArray operator>=(Array<Float> const &, Float const &);
-template Array<Float>& operator/=(Array<Float>&, MaskedArray<Float> const&);
-template MaskedArray<Float> const& operator*=(MaskedArray<Float> const&, Float const&);
-template MaskedArray<Float> operator-(MaskedArray<Float> const&, MaskedArray<Float> const&);
-template MaskedArray<Float> const& operator/=(MaskedArray<Float> const&, Float const&);
-template Float stddev(MaskedArray<Float> const&);
+template void convertArray<Bool, uChar>(Array<Bool> &, Array<uChar> const &);
+template void convertArray<uChar, Bool>(Array<uChar> &, Array<Bool> const &);
+template LogicalArray operator!=<Float>(Array<Float> const &, Float const &);
+template LogicalArray operator==<Float>(Array<Float> const &, Float const &);
+template LogicalArray operator><Float>(Array<Float> const &, Float const &);
+template LogicalArray operator>=<Float>(Array<Float> const &, Float const &);
+template Array<Float>& operator/=<Float>(Array<Float>&, MaskedArray<Float> const&);
+template MaskedArray<Float> const& operator*=<Float>(MaskedArray<Float> const&, Float const&);
+template MaskedArray<Float> operator-<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
+template MaskedArray<Float> const& operator/=<Float>(MaskedArray<Float> const&, Float const&);
+template Float stddev<Float>(MaskedArray<Float> const&);
 template class CompiledFunction<AutoDiff<Float> >;
 template class CompiledParam<AutoDiff<Float> >;
@@ -81 +84 @@
 template void Array<float>::tovector(vector<float> &) const;
 template void Array<Bool>::tovector(vector<bool> &) const;
-template void hanning(Vector<Float>&, Vector<Bool>&,
-                      const Vector<Float>&, const Vector<Bool>&, Bool, Bool);
 template void ImageUtilities::bin(MaskedArray<float>&, Coordinate&, MaskedArray<float> const&, Coordinate const&, uInt, uInt);
 template class PtrHolder<Lattice<Float> >;
-
+#include "MathUtils.cc"
+namespace mathutil {
+  template void hanning(Vector<Float>&, Vector<Bool>&,
+                        const Vector<Float>&, 
+                        const Vector<Bool>&, 
+                        Bool, Bool);
+}