jean perrot / ctools

Commit 256eb549da5075fdf0d6d6f6eca2e972e2cd0593

Authored by Jürgen Knödlseder
1 parent ecaf3bd8

Try reduce unit test execution time for cscripts

Inline Side-by-side
Showing 2 changed files with 20 additions and 20 deletions
test/test_cspull.py
  View file @256eb54
@@ -76,10 +76,10 @@ class Test(test): @@ -76,10 +76,10 @@ class Test(test):
76 # Setup cspull command 76 # Setup cspull command
77 cmd = cspull+' inmodel="'+self._model+'"'+ \ 77 cmd = cspull+' inmodel="'+self._model+'"'+ \
78 ' outfile="cspull_cmd1.dat"'+ \ 78 ' outfile="cspull_cmd1.dat"'+ \
79 - ' ntrials=3'+ \ 79 + ' ntrials=2'+ \
80 ' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \ 80 ' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \
81 ' ra=83.6331 dec=22.0145 emin=0.1 emax=100.0'+ \ 81 ' ra=83.6331 dec=22.0145 emin=0.1 emax=100.0'+ \
82 - ' enumbins=0 tmax=1800.0 deadc=0.95 rad=5.0'+ \ 82 + ' enumbins=0 tmax=100.0 deadc=0.95 rad=5.0'+ \
83 ' npix=200 binsz=0.05'+ \ 83 ' npix=200 binsz=0.05'+ \
84 ' logfile="cspull_cmd1.log" chatter=1' 84 ' logfile="cspull_cmd1.log" chatter=1'
85 85
@@ -97,10 +97,10 @@ class Test(test): @@ -97,10 +97,10 @@ class Test(test):
97 # Setup cspull command 97 # Setup cspull command
98 cmd = cspull+' inmodel="model_that_does_not_exist.xml"'+ \ 98 cmd = cspull+' inmodel="model_that_does_not_exist.xml"'+ \
99 ' outfile="cspull_cmd1.dat"'+ \ 99 ' outfile="cspull_cmd1.dat"'+ \
100 - ' ntrials=3'+ \ 100 + ' ntrials=2'+ \
101 ' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \ 101 ' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \
102 ' ra=83.6331 dec=22.0145 emin=0.1 emax=100.0'+ \ 102 ' ra=83.6331 dec=22.0145 emin=0.1 emax=100.0'+ \
103 - ' enumbins=0 tmax=1800.0 deadc=0.95 rad=5.0'+ \ 103 + ' enumbins=0 tmax=100.0 deadc=0.95 rad=5.0'+ \
104 ' npix=200 binsz=0.05'+ \ 104 ' npix=200 binsz=0.05'+ \
105 ' logfile="cspull_cmd2.log"' 105 ' logfile="cspull_cmd2.log"'
106 106
@@ -120,7 +120,7 @@ class Test(test): @@ -120,7 +120,7 @@ class Test(test):
120 pull = cscripts.cspull() 120 pull = cscripts.cspull()
121 pull['inmodel'] = self._model 121 pull['inmodel'] = self._model
122 pull['outfile'] = 'cspull_py1.dat' 122 pull['outfile'] = 'cspull_py1.dat'
123 - pull['ntrials'] = 3 123 + pull['ntrials'] = 2
124 pull['caldb'] = self._caldb 124 pull['caldb'] = self._caldb
125 pull['irf'] = self._irf 125 pull['irf'] = self._irf
126 pull['ra'] = 83.6331 126 pull['ra'] = 83.6331
@@ -128,7 +128,7 @@ class Test(test): @@ -128,7 +128,7 @@ class Test(test):
128 pull['emin'] = 0.1 128 pull['emin'] = 0.1
129 pull['emax'] = 100.0 129 pull['emax'] = 100.0
130 pull['enumbins'] = 0 130 pull['enumbins'] = 0
131 - pull['tmax'] = 1800.0 131 + pull['tmax'] = 100.0
132 pull['deadc'] = 0.95 132 pull['deadc'] = 0.95
133 pull['rad'] = 5.0 133 pull['rad'] = 5.0
134 pull['logfile'] = 'cspull_py1.log' 134 pull['logfile'] = 'cspull_py1.log'
@@ -146,7 +146,7 @@ class Test(test): @@ -146,7 +146,7 @@ class Test(test):
146 pull = cscripts.cspull() 146 pull = cscripts.cspull()
147 pull['inmodel'] = self._model 147 pull['inmodel'] = self._model
148 pull['outfile'] = 'cspull_py2.dat' 148 pull['outfile'] = 'cspull_py2.dat'
149 - pull['ntrials'] = 3 149 + pull['ntrials'] = 2
150 pull['caldb'] = self._caldb 150 pull['caldb'] = self._caldb
151 pull['irf'] = self._irf 151 pull['irf'] = self._irf
152 pull['ra'] = 83.6331 152 pull['ra'] = 83.6331
@@ -154,7 +154,7 @@ class Test(test): @@ -154,7 +154,7 @@ class Test(test):
154 pull['emin'] = 0.1 154 pull['emin'] = 0.1
155 pull['emax'] = 100.0 155 pull['emax'] = 100.0
156 pull['enumbins'] = 10 156 pull['enumbins'] = 10
157 - pull['tmax'] = 1800.0 157 + pull['tmax'] = 100.0
158 pull['deadc'] = 0.95 158 pull['deadc'] = 0.95
159 pull['rad'] = 5.0 159 pull['rad'] = 5.0
160 pull['npix'] = 100 160 pull['npix'] = 100
@@ -175,7 +175,7 @@ class Test(test): @@ -175,7 +175,7 @@ class Test(test):
175 pull['inobs'] = self._events 175 pull['inobs'] = self._events
176 pull['inmodel'] = self._model 176 pull['inmodel'] = self._model
177 pull['outfile'] = 'cspull_py3.dat' 177 pull['outfile'] = 'cspull_py3.dat'
178 - pull['ntrials'] = 3 178 + pull['ntrials'] = 2
179 pull['caldb'] = self._caldb 179 pull['caldb'] = self._caldb
180 pull['irf'] = self._irf 180 pull['irf'] = self._irf
181 pull['enumbins'] = 0 181 pull['enumbins'] = 0
@@ -197,7 +197,7 @@ class Test(test): @@ -197,7 +197,7 @@ class Test(test):
197 pull = cscripts.cspull(obs) 197 pull = cscripts.cspull(obs)
198 pull['inmodel'] = self._model 198 pull['inmodel'] = self._model
199 pull['outfile'] = 'cspull_py4.dat' 199 pull['outfile'] = 'cspull_py4.dat'
200 - pull['ntrials'] = 3 200 + pull['ntrials'] = 2
201 pull['caldb'] = self._caldb 201 pull['caldb'] = self._caldb
202 pull['irf'] = self._irf 202 pull['irf'] = self._irf
203 pull['enumbins'] = 0 203 pull['enumbins'] = 0
@@ -216,7 +216,7 @@ class Test(test): @@ -216,7 +216,7 @@ class Test(test):
216 pull['inobs'] = self._inobs 216 pull['inobs'] = self._inobs
217 pull['inmodel'] = self._stacked_model 217 pull['inmodel'] = self._stacked_model
218 pull['outfile'] = 'cspull_py5.dat' 218 pull['outfile'] = 'cspull_py5.dat'
219 - pull['ntrials'] = 3 219 + pull['ntrials'] = 2
220 pull['enumbins'] = 0 220 pull['enumbins'] = 0
221 pull['logfile'] = 'cspull_py5.log' 221 pull['logfile'] = 'cspull_py5.log'
222 pull['chatter'] = 4 222 pull['chatter'] = 4
@@ -235,7 +235,7 @@ class Test(test): @@ -235,7 +235,7 @@ class Test(test):
235 pull['inobs'] = self._inobs_two 235 pull['inobs'] = self._inobs_two
236 pull['inmodel'] = self._model 236 pull['inmodel'] = self._model
237 pull['outfile'] = 'cspull_py6.dat' 237 pull['outfile'] = 'cspull_py6.dat'
238 - pull['ntrials'] = 3 238 + pull['ntrials'] = 2
239 pull['emin'] = 0.02 239 pull['emin'] = 0.02
240 pull['emax'] = 100.0 240 pull['emax'] = 100.0
241 pull['enumbins'] = 10 241 pull['enumbins'] = 10
@@ -264,8 +264,8 @@ class Test(test): @@ -264,8 +264,8 @@ class Test(test):
264 pulls = gammalib.GCsv(filename) 264 pulls = gammalib.GCsv(filename)
265 265
266 # Check dimensions 266 # Check dimensions
267 - self.test_value(pulls.nrows(), 4,  
268 - 'Check for 4 rows in pull file') 267 + self.test_value(pulls.nrows(), 3,
  268 + 'Check for 3 rows in pull file')
269 269
270 # Return 270 # Return
271 return 271 return
test/test_cssens.py
  View file @256eb54
1 #! /usr/bin/env python 1 #! /usr/bin/env python
2 # ========================================================================== 2 # ==========================================================================
3 -# This scripts performs unit tests for the cssens script. 3 +# This scripts performs unit tests for the cssens script
4 # 4 #
5 # Copyright (C) 2016 Juergen Knoedlseder 5 # Copyright (C) 2016 Juergen Knoedlseder
6 # 6 #
@@ -72,7 +72,7 @@ class Test(test): @@ -72,7 +72,7 @@ class Test(test):
72 cmd = cssens+' inmodel="'+self._model+'"'+ \ 72 cmd = cssens+' inmodel="'+self._model+'"'+ \
73 ' srcname="Crab"'+ \ 73 ' srcname="Crab"'+ \
74 ' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \ 74 ' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \
75 - ' duration=1800.0 rad=3.0 emin=1.0 emax=10.0 bins=1'+ \ 75 + ' duration=500.0 rad=3.0 emin=1.0 emax=10.0 bins=1'+ \
76 ' outfile="cssens_cmd1.dat"'+ \ 76 ' outfile="cssens_cmd1.dat"'+ \
77 ' logfile="cssens_cmd1.log" chatter=1' 77 ' logfile="cssens_cmd1.log" chatter=1'
78 78
@@ -91,7 +91,7 @@ class Test(test): @@ -91,7 +91,7 @@ class Test(test):
91 cmd = cssens+' inmodel="model_that_does_not_exist.xml"'+ \ 91 cmd = cssens+' inmodel="model_that_does_not_exist.xml"'+ \
92 ' srcname="Crab"'+ \ 92 ' srcname="Crab"'+ \
93 ' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \ 93 ' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \
94 - ' duration=1800.0 rad=3.0 emin=1.0 emax=10.0 bins=1'+ \ 94 + ' duration=500.0 rad=3.0 emin=1.0 emax=10.0 bins=1'+ \
95 ' outfile="cssens_cmd2.dat"'+ \ 95 ' outfile="cssens_cmd2.dat"'+ \
96 ' logfile="cssens_cmd2.log" chatter=2' 96 ' logfile="cssens_cmd2.log" chatter=2'
97 97
@@ -115,7 +115,7 @@ class Test(test): @@ -115,7 +115,7 @@ class Test(test):
115 sens['caldb'] = self._caldb 115 sens['caldb'] = self._caldb
116 sens['irf'] = self._irf 116 sens['irf'] = self._irf
117 sens['outfile'] = 'cssens_py1.dat' 117 sens['outfile'] = 'cssens_py1.dat'
118 - sens['duration'] = 1800.0 118 + sens['duration'] = 500.0
119 sens['rad'] = 3.0 119 sens['rad'] = 3.0
120 sens['emin'] = 1.0 120 sens['emin'] = 1.0
121 sens['emax'] = 10.0 121 sens['emax'] = 10.0
@@ -144,9 +144,9 @@ class Test(test): @@ -144,9 +144,9 @@ class Test(test):
144 144
145 # Check dimensions 145 # Check dimensions
146 self.test_value(results.nrows(), 2, 146 self.test_value(results.nrows(), 2,
147 - 'Check for 2 rows in sensitivity file') 147 + 'Check number of rows in sensitivity file')
148 self.test_value(results.ncols(), 7, 148 self.test_value(results.ncols(), 7,
149 - 'Check for 7 columns in sensitivity file') 149 + 'Check number of columns in sensitivity file')
150 150
151 # Return 151 # Return
152 return 152 return