Add some C interface unit tests.

Also fixed up a few small issues found

Author: wcjohns

CMakeLists.txt

@@ -28,6 +28,14 @@ option( SpecUtils_ENABLE_EQUALITY_CHECKS "Enables the equal_enough(...) function
 option( PERFORM_DEVELOPER_CHECKS "Performs additional computationally expensive tests during execution (requires linking to boost)" OFF )
 
 
+if( SpecUtils_PYTHON_BINDINGS )
+  option( SpecUtils_SHARED_LIB "Whether to compile a shared, or static library" ON )
+  list( APPEND sources bindings/python/SpecFile_py.cpp )
+else()
+  #default to building a static lib
+  option( SpecUtils_SHARED_LIB "Whether to compile a shared, or static library" OFF )
+endif()
+
 
 set( SpecUtils_FLT_PARSE_METHOD "default_value" CACHE STRING [[How to parse lists of numbers.
 Choose one of: FastFloat, FromChars, boost, strtod.
@@ -247,16 +255,11 @@ if( SpecUtils_ENABLE_URI_SPECTRA )
   find_package( ZLIB REQUIRED )
 endif( SpecUtils_ENABLE_URI_SPECTRA )
 
-#default to building a static lib
-set( SpecUtils_LIB_TYPE STATIC )
-
 if( SpecUtils_PYTHON_BINDINGS )
-  set( SpecUtils_LIB_TYPE SHARED )
   list( APPEND sources bindings/python/SpecFile_py.cpp )
 endif( SpecUtils_PYTHON_BINDINGS )
 
 if( SpecUtils_JAVA_SWIG )
-  set( SpecUtils_LIB_TYPE SHARED )
   list( APPEND sources bindings/swig/SpecUtils.i )
 endif( SpecUtils_JAVA_SWIG )
 
@@ -265,6 +268,12 @@ if( SpecUtils_C_BINDINGS )
   list( APPEND sources bindings/c/SpecUtils_c.cpp )
 endif( SpecUtils_C_BINDINGS )
 
+if( SpecUtils_SHARED_LIB )
+  set( SpecUtils_LIB_TYPE SHARED )
+else( SpecUtils_SHARED_LIB )
+  set( SpecUtils_LIB_TYPE STATIC )
+endif( SpecUtils_SHARED_LIB )
+
 add_library( SpecUtils ${SpecUtils_LIB_TYPE} ${sources} ${headers} ${OTHER_SUPPORT_FILES} )
 set_target_properties( SpecUtils PROPERTIES PREFIX "lib" OUTPUT_NAME "SpecUtils" )
 

bindings/c/SpecUtils_c.cpp

@@ -1511,6 +1511,30 @@ void SpecUtils_Measurement_reset( SpecUtils_Measurement *instance )
 }
 
 
+const char *SpecUtils_Measurement_description( const SpecUtils_Measurement * const instance )
+{
+  auto m = reinterpret_cast<const SpecUtils::Measurement *>( instance );
+  assert( m );
+  if( !m )
+    return "";
+  
+  const vector<string> &remarks = m->remarks();
+  
+  for( size_t i = 0; i < remarks.size(); ++i )
+  {
+    if( SpecUtils::istarts_with(remarks[i], "Description:") )
+    {
+      const char *answer = remarks[i].c_str() + 12;
+      while( *answer && ((*answer) == ' ') )
+        ++answer;
+      return answer;
+    }
+  }//
+  
+  return "";
+}
+
+
 void SpecUtils_Measurement_set_description( SpecUtils_Measurement *instance,
                                       const char * const description_cstr )
 {
@@ -1547,6 +1571,30 @@ void SpecUtils_Measurement_set_description( SpecUtils_Measurement *instance,
 }
 
 
+const char *SpecUtils_Measurement_source_string( const SpecUtils_Measurement * const instance )
+{
+  auto m = reinterpret_cast<const SpecUtils::Measurement *>( instance );
+  assert( m );
+  if( !m )
+    return "";
+  
+  const vector<string> &remarks = m->remarks();
+  
+  for( size_t i = 0; i < remarks.size(); ++i )
+  {
+    if( SpecUtils::istarts_with(remarks[i], "Source:") )
+    {
+      const char *answer = remarks[i].c_str() + 7;
+      while( *answer && ((*answer) == ' ') )
+        ++answer;
+      return answer;
+    }
+  }//
+  
+  return "";
+}
+
+
 void SpecUtils_Measurement_set_source_string( SpecUtils_Measurement *instance,
                                         const char * const source_string_cstr )
 {
@@ -1602,6 +1650,23 @@ void SpecUtils_Measurement_set_gamma_counts( SpecUtils_Measurement *instance,
 }
 
 
+void SpecUtils_Measurement_set_neutron_counts( SpecUtils_Measurement *instance,
+                                         const float * const counts,
+                                         const uint32_t num_tubes,
+                                         const float neutron_live_time )
+{
+  auto m = reinterpret_cast<SpecUtils::Measurement *>( instance );
+  assert( m );
+  assert( counts || (num_tubes == 0) ); //If `counts` is null, then `num_tubes` better be zero to.
+  
+  if( !m )
+    return;
+  
+  const vector<float> nc = counts ? vector<float>(counts, counts + num_tubes) : vector<float>{};
+  m->set_neutron_counts( nc, neutron_live_time );
+}//SpecUtils_Measurement_set_neutron_counts(...)
+
+
 const char *SpecUtils_Measurement_title( const SpecUtils_Measurement * const instance )
 {
   auto m = reinterpret_cast<const SpecUtils::Measurement *>( instance );
@@ -1667,6 +1732,8 @@ bool SpecUtils_Measurement_set_start_time_str( SpecUtils_Measurement *instance,
 
   if( m )
     m->set_start_time( tp );
+  
+  return m && !SpecUtils::is_special(tp);
 }
 
 char SpecUtils_Measurement_pcf_tag( const SpecUtils_Measurement * const instance )

bindings/c/SpecUtils_c.h

@@ -721,11 +721,19 @@ SpecUtils_Measurement_set_equal( SpecUtils_Measurement *lhs, const SpecUtils_Mea
 DLLEXPORT void CALLINGCONVENTION
 SpecUtils_Measurement_reset( SpecUtils_Measurement *instance );
 
+/** Returns the measurement description. Zero terminated, and non-null. */
+DLLEXPORT const char * CALLINGCONVENTION
+SpecUtils_Measurement_description( const SpecUtils_Measurement * const instance );
 
+  
 DLLEXPORT void CALLINGCONVENTION
 SpecUtils_Measurement_set_description( SpecUtils_Measurement *instance,
                                       const char * const description );
 
+/** Returns the measurement description. Zero terminated, and non-null. */
+DLLEXPORT const char * CALLINGCONVENTION
+SpecUtils_Measurement_source_string( const SpecUtils_Measurement * const instance );
+  
 /** This is a GADRAS specific function - it actually adds a remark to Measurement that starts with "Source:" */
 DLLEXPORT void CALLINGCONVENTION
 SpecUtils_Measurement_set_source_string( SpecUtils_Measurement *instance,
@@ -737,6 +745,21 @@ SpecUtils_Measurement_set_gamma_counts( SpecUtils_Measurement *instance,
                                        const uint32_t nchannels,
                                        const float live_time,
                                        const float real_time );
+
+/** Sets the neutron counts.
+ 
+ @param instance The `SpecUtils_Measurement` to to modify.
+ @param counts The array of counts from each neutron detector.  Most detectors will probably have one entry
+        but for example, if you have multiple He3 tubes, you may have multiple entries.
+ @param num_tubes The number of entries in `counts`.
+ @param neutron_live_time The live time of the neutron measurement.  If it is the same as the gamma detector
+        in this measurement, you can provide a negative value, and the gamma real-time will be used.
+ */
+DLLEXPORT void CALLINGCONVENTION
+SpecUtils_Measurement_set_neutron_counts( SpecUtils_Measurement *instance,
+                                         const float * const counts,
+                                         const uint32_t num_tubes,
+                                         const float neutron_live_time );
 
 DLLEXPORT const char * CALLINGCONVENTION
 SpecUtils_Measurement_title( const SpecUtils_Measurement * const instance );

unit_tests/CMakeLists.txt

@@ -207,6 +207,16 @@ if( SpecUtils_ENABLE_URI_SPECTRA )
   )
 endif()
 
+if( SpecUtils_C_BINDINGS )
+  add_executable( test_c_interface test_c_interface.cpp )
+  target_link_libraries( test_c_interface PRIVATE SpecUtils )
+  set_target_properties( test_c_interface PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED YES CXX_EXTENSIONS NO )
+  add_test(
+    NAME test_c_interface
+    COMMAND $<TARGET_FILE:test_c_interface> ${COMMON_TEST_ARGS} -- ${DATA_DIR_ARGS}
+  )
+endif( SpecUtils_C_BINDINGS )
+
 if( PERFORM_DEVELOPER_CHECKS AND (Boost_VERSION VERSION_GREATER_EQUAL "1.81.0") )
   add_executable( test_hash test_hash.cpp )
   target_link_libraries( test_hash PRIVATE SpecUtils Boost::system )