[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 21b446c928b84998d99d654826e8e5b6c72e0026
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sat Nov 10 13:03:45 2012 +0200

    uncomplicate mirror file names in {psd,mc}.cc

diff --git a/src/metrics/mc.cc b/src/metrics/mc.cc
index 1af85ec..80b4e2f 100644
--- a/src/metrics/mc.cc
+++ b/src/metrics/mc.cc
@@ -28,11 +28,9 @@ fname_base() const
 {
 	DEF_UNIQUE_CHARP (_);
 	assert (asprintf( &_,
-			  "%s-%s-%zu-%g-%c%c-%zu",
+			  "%s-%s-%zu-%zu",
 			  _using_F.filename(), _using_F.channel_by_id(_using_sig_no),
-			  _using_F.pagesize(), 42.,
-			  'a'+(char)0,
-			  'a'+(char)0,
+			  _using_F.pagesize(),
 			  _signature) > 1);
 	string ret {_};
 	return ret;
diff --git a/src/metrics/psd.cc b/src/metrics/psd.cc
index fcdaf4e..adb7023 100644
--- a/src/metrics/psd.cc
+++ b/src/metrics/psd.cc
@@ -82,11 +82,10 @@ fname_base() const
 {
 	DEF_UNIQUE_CHARP (_);
 	assert (asprintf( &_,
-			  "%s-%s-%zu-%c%c-%zu",
+			  "%s-%s-%zu-%c-%zu",
 			  _using_F.filename(), _using_F.channel_by_id(_using_sig_no),
 			  SFFTParamSet::pagesize, //freq_trunc,
 			  'a'+(char)welch_window_type,
-			  'a'+(char)_using_F.artifacts(_using_sig_no).dampen_window_type,
 			  _signature) > 1);
 	string ret {_};
 	return ret;
@@ -126,10 +125,10 @@ compute( const SFFTParamSet& req_params,
 	string basename_dot = agh::fs::make_fname_base (_using_F.filename(), "", true);
 
 	assert (asprintf( &old_mirror_fname,
-			  "%s-%s-%zu-%g:%c%c-%zu.psd",
+			  "%s-%s-%zu-%g:%c-%zu.psd",
 			  basename_dot.c_str(),
 			  _using_F.channel_by_id(_using_sig_no), _pagesize, binsize,
-			  'a'+(char)welch_window_type, 'a'+(char)_using_F.artifacts(_using_sig_no).dampen_window_type,
+			  'a'+(char)welch_window_type,
 			  _signature)
 		> 1);
 
@@ -137,10 +136,10 @@ compute( const SFFTParamSet& req_params,
 	*(SFFTParamSet*)this = req_params;
 	_signature = req_signature;
 	assert (asprintf( &new_mirror_fname,
-			  "%s-%s-%zu-%g:%c%c-%zu.psd",
+			  "%s-%s-%zu-%g:%c-%zu.psd",
 			  basename_dot.c_str(),
 			  _using_F.channel_by_id(_using_sig_no), _pagesize, binsize,
-			  'a'+(char)welch_window_type, 'a'+(char)_using_F.artifacts(_using_sig_no).dampen_window_type,
+			  'a'+(char)welch_window_type,
 			  _signature)
 		> 1);
 

-- 
Sleep experiment manager