From: Yaroslav Halchenko <debian@onerussian.com>
Subject:  make test scripts being importable -- move function under __main__


--- a/brian/hears/filtering/test2.py
+++ b/brian/hears/filtering/test2.py
@@ -7,48 +7,48 @@ from scipy.io import loadmat,savemat
 from brian.hears import *
 #from zilany import *
 
+if __name__ == '__main__':
+    simulation_duration = 100*ms
+    set_default_samplerate(50*kHz)
+    sound = whitenoise(simulation_duration)
+    #file="/home/bertrand/Data/MatlabProg/brian_hears/Carney/sound.mat"
+    #X=loadmat(file,struct_as_record=False)
+    #sound = Sound(X['sound'].flatten())
+    sound.samplerate = 50*kHz
+    sound = sound.atlevel(120*dB) # level in rms dB SPL
+    X={}
+    X['sound'] = sound.__array__()
+    savemat('/home/bertrand/Data/MatlabProg/brian_hears/Carney/sound.mat',X)
 
-simulation_duration = 100*ms
-set_default_samplerate(50*kHz)
-sound = whitenoise(simulation_duration)
-#file="/home/bertrand/Data/MatlabProg/brian_hears/Carney/sound.mat"
-#X=loadmat(file,struct_as_record=False)
-#sound = Sound(X['sound'].flatten())
-sound.samplerate = 50*kHz
-sound = sound.atlevel(120*dB) # level in rms dB SPL
-X={}
-X['sound'] = sound.__array__()
-savemat('/home/bertrand/Data/MatlabProg/brian_hears/Carney/sound.mat',X)
+    #sound = Sound(randn(1000))
+    #plot(sound)
+    #show()
+    #sound.samplerate = 100*kHz
+    cf = array([1000*Hz])#erbspace(100*Hz, 1000*Hz, 50) # centre frequencies
+    #cf = erbspace(100*Hz, 1000*Hz, 500) # centre frequencies
 
-#sound = Sound(randn(1000))
-#plot(sound)
-#show()
-#sound.samplerate = 100*kHz
-cf = array([1000*Hz])#erbspace(100*Hz, 1000*Hz, 50) # centre frequencies
-#cf = erbspace(100*Hz, 1000*Hz, 500) # centre frequencies
+    param_drnl = {}
+    #param_drnl['lp_nl_cutoff_m'] = 1.1
+    zilany_filter=TAN(sound, cf,1)
+    #zilany_filter=DRNL(sound, cf)
+    t1=time()
+    drnl = zilany_filter.process()
+    print time()-t1
+    print drnl.shape
+    #drnl =zilany_filter.control_cont 
+    #drnl =zilany_filter.signal_cont 
+    X={}
+    X['out_BM'] = drnl[:]
+    #X['out_BM'] = zilany_filter.param
+    savemat('/home/bertrand/Data/MatlabProg/brian_hears/Carney/out_BM.mat',X)
 
-param_drnl = {}
-#param_drnl['lp_nl_cutoff_m'] = 1.1
-zilany_filter=TAN(sound, cf,1)
-#zilany_filter=DRNL(sound, cf)
-t1=time()
-drnl = zilany_filter.process()
-print time()-t1
-print drnl.shape
-#drnl =zilany_filter.control_cont 
-#drnl =zilany_filter.signal_cont 
-X={}
-X['out_BM'] = drnl[:]
-#X['out_BM'] = zilany_filter.param
-savemat('/home/bertrand/Data/MatlabProg/brian_hears/Carney/out_BM.mat',X)
-
-#figure()
-subplot(211)
-##print drnl[:]R
-plot(drnl[:])
-#imshow(flipud(drnl.T), aspect='auto')
-subplot(212)
-#print sound
-plot(sound)
-#imshow(flipud(dcgc.T), aspect='auto')
-show()
+    #figure()
+    subplot(211)
+    ##print drnl[:]R
+    plot(drnl[:])
+    #imshow(flipud(drnl.T), aspect='auto')
+    subplot(212)
+    #print sound
+    plot(sound)
+    #imshow(flipud(dcgc.T), aspect='auto')
+    show()
--- a/brian/hears/filtering/test.py
+++ b/brian/hears/filtering/test.py
@@ -7,47 +7,47 @@ from scipy.io import loadmat,savemat
 from brian.hears import *
 #from zilany import *
 
-
-simulation_duration = 1*ms
-set_default_samplerate(100*kHz)
-#sound = whitenoise(simulation_duration)
-file="/home/bertrand/Data/MatlabProg/brian_hears/ZilanyCarney-JASAcode-2009/sound.mat"
-X=loadmat(file,struct_as_record=False)
-sound = Sound(X['sound'].flatten())
-sound.samplerate = 100*kHz
-#sound = sound.atlevel(10*dB) # level in rms dB SPL
-#X={}
-#X['sound'] = sound.__array__()
-#savemat('/home/bertrand/Data/MatlabProg/brian_hears/ZilanyCarney-JASAcode-2009/sound.mat',X)
-
-#sound = Sound(randn(1000))
-#plot(sound)
-#show()
-#sound.samplerate = 100*kHz
-cf = array([100*Hz,100*Hz,100*Hz,100*Hz])#erbspace(100*Hz, 1000*Hz, 50) # centre frequencies
-cf = erbspace(100*Hz, 1000*Hz, 500) # centre frequencies
-
-param_drnl = {}
-#param_drnl['lp_nl_cutoff_m'] = 1.1
-zilany_filter=ZILANY(sound, cf,32)
-#zilany_filter=DRNL(sound, cf)
-t1=time()
-drnl = zilany_filter.process()
-print time()-t1
-#drnl =zilany_filter.rsigma
-X={}
-X['out_BM'] = drnl[:]
-#X['out_BM'] = zilany_filter.rsigma
-savemat('/home/bertrand/Data/MatlabProg/brian_hears/ZilanyCarney-JASAcode-2009/out_BM.mat',X)
-
-#figure()
-subplot(211)
-##print drnl[:]R
-plot(drnl[:])
-
-#imshow(flipud(drnl.T), aspect='auto')
-subplot(212)
-#print sound
-plot(sound)
-#imshow(flipud(dcgc.T), aspect='auto')
-show()
+if __name__ == '__main__':
+    simulation_duration = 1*ms
+    set_default_samplerate(100*kHz)
+    #sound = whitenoise(simulation_duration)
+    file="/home/bertrand/Data/MatlabProg/brian_hears/ZilanyCarney-JASAcode-2009/sound.mat"
+    X=loadmat(file,struct_as_record=False)
+    sound = Sound(X['sound'].flatten())
+    sound.samplerate = 100*kHz
+    #sound = sound.atlevel(10*dB) # level in rms dB SPL
+    #X={}
+    #X['sound'] = sound.__array__()
+    #savemat('/home/bertrand/Data/MatlabProg/brian_hears/ZilanyCarney-JASAcode-2009/sound.mat',X)
+
+    #sound = Sound(randn(1000))
+    #plot(sound)
+    #show()
+    #sound.samplerate = 100*kHz
+    cf = array([100*Hz,100*Hz,100*Hz,100*Hz])#erbspace(100*Hz, 1000*Hz, 50) # centre frequencies
+    cf = erbspace(100*Hz, 1000*Hz, 500) # centre frequencies
+
+    param_drnl = {}
+    #param_drnl['lp_nl_cutoff_m'] = 1.1
+    zilany_filter=ZILANY(sound, cf,32)
+    #zilany_filter=DRNL(sound, cf)
+    t1=time()
+    drnl = zilany_filter.process()
+    print time()-t1
+    #drnl =zilany_filter.rsigma
+    X={}
+    X['out_BM'] = drnl[:]
+    #X['out_BM'] = zilany_filter.rsigma
+    savemat('/home/bertrand/Data/MatlabProg/brian_hears/ZilanyCarney-JASAcode-2009/out_BM.mat',X)
+
+    #figure()
+    subplot(211)
+    ##print drnl[:]R
+    plot(drnl[:])
+
+    #imshow(flipud(drnl.T), aspect='auto')
+    subplot(212)
+    #print sound
+    plot(sound)
+    #imshow(flipud(dcgc.T), aspect='auto')
+    show()
