comparison src/Main/AIMCopy_SSI_Features_v3.cc @ 160:747ba38b4b1b

- AIMCopy v5 for just smooth NAP features
- Reporting of all modules and versions

   string data_file;
   string config_file;
   string script_file;
   bool write_data = false;
   bool print_version = false;
-  bool load_params = false;
 
   string version_string(
     " AIM-C AIMCopy\n"
     "  (c) 2006-2010, Thomas Walters and Willem van Engen\n"
     "  http://www.acoustiscale.org/AIMC/\n"

       if (++i >= argc) {
         aimc::LOG_ERROR(_T("Configuration file name expected after -C"));
         return(-1);
       }
       config_file = argv[i];
-      load_params = true;
       continue;
     }
     if (strcmp(argv[i],"-S") == 0) {
       if (++i >= argc) {
         aimc::LOG_ERROR(_T("Script file name expected after -S"));

   if (print_version)
     printf("%s", version_string.c_str());
 
   aimc::Parameters params;
 
-  if (load_params) {
-    if (!params.Load(config_file.c_str())) {
-      aimc::LOG_ERROR(_T("Couldn't load parameters from file %s"),
-                      config_file.c_str());
-      return -1;
-    }
+  if (!params.Load(config_file.c_str())) {
+    aimc::LOG_ERROR(_T("Couldn't load parameters from file %s"),
+                    config_file.c_str());
+    return -1;
   }
 
   vector<pair<string, string> > file_list = aimc::FileList::Load(script_file);
   if (file_list.size() == 0) {
     aimc::LOG_ERROR("No data read from file %s", script_file.c_str());

 
   for (unsigned int i = 0; i < file_list.size(); ++i) {
     // aimc::LOG_INFO(_T("In:  %s"), file_list[i].first.c_str());
     aimc::LOG_INFO(_T("Out: %s"), file_list[i].second.c_str());
 
-    string filename = file_list[i].second + "slice_1_no_cutoff";
+    string filename = file_list[i].second + ".slice_1_no_cutoff";
     output_ssi_slice1_no_cutoff.OpenFile(filename.c_str(), 10.0f);
-    filename = file_list[i].second + "ssi_profile_no_cutoff";
+    filename = file_list[i].second + ".ssi_profile_no_cutoff";
     output_ssi_all_no_cutoff.OpenFile(filename.c_str(), 10.0f);
-    filename = file_list[i].second + "slice_1_cutoff";
+    filename = file_list[i].second + ".slice_1_cutoff";
     output_ssi_slice1_cutoff.OpenFile(filename.c_str(), 10.0f);
-    filename = file_list[i].second + "ssi_profile_cutoff";
+    filename = file_list[i].second + ".ssi_profile_cutoff";
     output_ssi_all_cutoff.OpenFile(filename.c_str(), 10.0f);
-    filename = file_list[i].second + "smooth_nap_profile";
+    filename = file_list[i].second + ".smooth_nap_profile";
     nap_out.OpenFile(filename.c_str(), 10.0f);
 
     if (input.LoadFile(file_list[i].first.c_str())) {
       input.Process();
     } else {