Changeset 2445 for trunk

Timestamp:

03/29/12 12:37:19 (13 years ago)

Author:

Malte Marquarding

Message:

Temporary fix for divergence of casacore and casapy

Location:

trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• src/STFitter.cpp (modified) (1 diff)

trunk/CMakeLists.txt

@@ -15 +15 @@
 message( STATUS "USE_LIBCASACORE = " ${USE_LIBCASACORE} )
 message( STATUS "STANDALONE = " ${STANDALONE} )
+
+# Use casapy's fork of casacore  
+if ( NOT STANDALONE )
+  add_definitions( -DUSE_CASAPY )
+endif ()
 
 # Define compiler paths on OSX 10.5. This must be done before invoking project()
@@ -42 +47 @@
 # default is RelWithDebInfo
 #
+
+
 if ( NOT CMAKE_BUILD_TYPE )
    set( CMAKE_BUILD_TYPE RelWithDebInfo )

trunk/src/STFitter.cpp

@@ -118 +118 @@
     g = dynamic_cast<Gaussian1D<Float>* >(funcs_[i]);
     if (g) {
+#ifdef USE_CASAPY
+      const GaussianSpectralElement *gauss = 
+        dynamic_cast<const GaussianSpectralElement *>(listGauss[i]) ;
+      (*g)[0] = gauss->getAmpl();
+      (*g)[1] = gauss->getCenter();
+      (*g)[2] = gauss->getFWHM();     
+#else      
       (*g)[0] = listGauss[i].getAmpl();
       (*g)[1] = listGauss[i].getCenter();
       (*g)[2] = listGauss[i].getFWHM();
+#endif
     }
   }