Remove --show-gravitino: we'll always show it from now

Sat, 26 Feb 2011 23:21:12 +0100

author
Andy Buckley <andy@insectnation.org>
date
Sat, 26 Feb 2011 23:21:12 +0100
changeset 120
bffefe12df80
parent 119
6b918f65b962
child 121
402d6abf64b7

Remove --show-gravitino: we'll always show it from now

ChangeLog file | annotate | diff | comparison | revisions
pyslha.py file | annotate | diff | comparison | revisions
slhaplot file | annotate | diff | comparison | revisions
     1.1 --- a/ChangeLog	Sat Feb 26 02:27:08 2011 +0100
     1.2 +++ b/ChangeLog	Sat Feb 26 23:21:12 2011 +0100
     1.3 @@ -1,3 +1,18 @@
     1.4 +2011-02-26  Andy Buckley  <andy@insectnation.org>
     1.5 +
     1.6 +	* Removing the --show-gravitino argument from slhaplot: I see no
     1.7 +	reason to treat gravitinos specially and clutter the UI, so if the
     1.8 +	gravitino is there, we plot it! Until we supply a
     1.9 +	user-customization hook for the particle display details, removing
    1.10 +	the gravitino will have to be done by hacking the TeX (or
    1.11 +	slhaplot) source.
    1.12 +
    1.13 +	* Version 1.0.8
    1.14 +
    1.15 +	* Adding non-SUSY HERWIG IDHW <-> PDGID particle ID code mappings.
    1.16 +
    1.17 +	* Protecting plotter against unknown particles in decay spec.
    1.18 +
    1.19  2011-02-22  Andy Buckley  <andy@insectnation.org>
    1.20  
    1.21  	* Bump version to 1.0.7
    1.22 @@ -6,586 +21,131 @@
    1.23  
    1.24  	* Add gravitino rendering, based on a patch from Martin Spinrath.
    1.25  
    1.26 -changeset:   112:053699571fd2
    1.27 -tag:         tip
    1.28 -user:        Andy Buckley <andy@insectnation.org>
    1.29 -date:        Wed Jan 26 16:13:01 2011 +0000
    1.30 +
    1.31 +date:        Wed Jan 26 16:10:01 2011 +0000
    1.32  summary:     Added tag pyslha-1.0.6 for changeset 4f426f1f5923
    1.33 -
    1.34 -changeset:   111:4f426f1f5923
    1.35 -tag:         pyslha-1.0.6
    1.36 -user:        Andy Buckley <andy@insectnation.org>
    1.37 -date:        Wed Jan 26 16:10:01 2011 +0000
    1.38  summary:     Merge in a version of decay line color scaling in proportion to branching ratio, from Martin Spinrath
    1.39  
    1.40 -changeset:   110:0064d3bcda09
    1.41 -user:        Andy Buckley <andy@insectnation.org>
    1.42  date:        Fri Jan 21 13:51:06 2011 +0000
    1.43  summary:     Added tag pyslha-1.0.5 for changeset 0502c4942fbc
    1.44 -
    1.45 -changeset:   109:0502c4942fbc
    1.46 -tag:         pyslha-1.0.5
    1.47 -user:        Andy Buckley <andy@insectnation.org>
    1.48 -date:        Fri Jan 21 13:50:54 2011 +0000
    1.49  summary:     Fix units issue in slhaplot -- thanks to Martin Spinrath!
    1.50  
    1.51 -changeset:   108:d0c4ff9d4efd
    1.52 -user:        Andy Buckley <andy@insectnation.org>
    1.53  date:        Thu Dec 30 20:56:50 2010 +0000
    1.54  summary:     Ignore setup build and dist directories
    1.55 -
    1.56 -changeset:   107:27988e18386a
    1.57 -user:        Andy Buckley <andy@insectnation.org>
    1.58 -date:        Thu Dec 30 20:54:40 2010 +0000
    1.59  summary:     Added tag pyslha-1.0.4 for changeset 513c294bc9dd
    1.60 -
    1.61 -changeset:   106:513c294bc9dd
    1.62 -tag:         pyslha-1.0.4
    1.63 -user:        Andy Buckley <andy@insectnation.org>
    1.64 -date:        Thu Dec 30 20:54:30 2010 +0000
    1.65  summary:     Use normal distutils
    1.66 -
    1.67 -changeset:   105:1da74ab54f7b
    1.68 -user:        Andy Buckley <andy@insectnation.org>
    1.69 -date:        Thu Dec 30 19:06:43 2010 +0000
    1.70  summary:     Added tag pyslha-1.0.3 for changeset f3c3eb463cb1
    1.71 -
    1.72 -changeset:   104:f3c3eb463cb1
    1.73 -tag:         pyslha-1.0.3
    1.74 -user:        Andy Buckley <andy@insectnation.org>
    1.75 -date:        Thu Dec 30 19:06:39 2010 +0000
    1.76 -summary:     Wrong URL
    1.77 -
    1.78 -changeset:   103:92891b6e6789
    1.79 -user:        Andy Buckley <andy@insectnation.org>
    1.80 -date:        Thu Dec 30 18:32:33 2010 +0000
    1.81 -summary:     More plotting TODOs
    1.82 -
    1.83 -changeset:   102:503f1a09ed79
    1.84 -user:        Andy Buckley <andy@insectnation.org>
    1.85 -date:        Thu Dec 30 18:25:52 2010 +0000
    1.86  summary:     Added tag pyslha-1.0.2 for changeset 3a7032d517e3
    1.87 -
    1.88 -changeset:   101:3a7032d517e3
    1.89 -tag:         pyslha-1.0.2
    1.90 -user:        Andy Buckley <andy@insectnation.org>
    1.91 -date:        Thu Dec 30 18:25:41 2010 +0000
    1.92  summary:     Add web page link, y-scalefactor in TeX comment, and default format indicator in help output
    1.93  
    1.94 -changeset:   100:b7d95d1269b8
    1.95 -user:        Andy Buckley <andy@insectnation.org>
    1.96  date:        Tue Nov 30 20:19:45 2010 +0000
    1.97  summary:     Added tag pyslha-1.0.1 for changeset c0c964fdbe5f
    1.98 -
    1.99 -changeset:   99:c0c964fdbe5f
   1.100 -tag:         pyslha-1.0.1
   1.101 -user:        Andy Buckley <andy@insectnation.org>
   1.102 -date:        Tue Nov 30 20:19:41 2010 +0000
   1.103  summary:     Doc correction and version bump now that PDF plotting is done internally to slhaplot
   1.104 -
   1.105 -changeset:   98:560a7ba9b3fb
   1.106 -user:        Andy Buckley <andy@insectnation.org>
   1.107 -date:        Tue Nov 30 15:12:36 2010 +0000
   1.108  summary:     Added tag pyslha-1.0.0 for changeset f82d84b0002b
   1.109 -
   1.110 -changeset:   97:f82d84b0002b
   1.111 -tag:         pyslha-1.0.0
   1.112 -user:        Andy Buckley <andy@insectnation.org>
   1.113 -date:        Tue Nov 30 15:12:28 2010 +0000
   1.114  summary:     A big moment -- I see no reason not to call this version 1.0.0 now that all the plotting works as I intended!
   1.115 -
   1.116 -changeset:   96:6ad4a953db93
   1.117 -user:        Andy Buckley <andy@insectnation.org>
   1.118 -date:        Tue Nov 30 15:11:06 2010 +0000
   1.119  summary:     Set decay line width based on BR by default, contollable with new --decaystyle option
   1.120 -
   1.121 -changeset:   95:63ae1d5bbe4e
   1.122 -user:        Andy Buckley <andy@insectnation.org>
   1.123 -date:        Tue Nov 30 14:55:00 2010 +0000
   1.124  summary:     Allow plotting from a string cated from stdin
   1.125 -
   1.126 -changeset:   94:77808406c2d0
   1.127 -user:        Andy Buckley <andy@insectnation.org>
   1.128 -date:        Tue Nov 30 14:48:47 2010 +0000
   1.129 -summary:     Doc tweak
   1.130 -
   1.131 -changeset:   93:451da9d4db08
   1.132 -user:        Andy Buckley <andy@insectnation.org>
   1.133 -date:        Tue Nov 30 14:47:05 2010 +0000
   1.134  summary:     Make merged labels maintain the plot size by introducing x scaling
   1.135 -
   1.136 -changeset:   92:07ab27adb2ac
   1.137 -user:        Andy Buckley <andy@insectnation.org>
   1.138 -date:        Tue Nov 30 14:30:52 2010 +0000
   1.139 -summary:     Rm addressed TODOs
   1.140 -
   1.141 -changeset:   91:99118ef791ea
   1.142 -user:        Andy Buckley <andy@insectnation.org>
   1.143 -date:        Tue Nov 30 14:26:15 2010 +0000
   1.144  summary:     Document label treatment options
   1.145  
   1.146 -changeset:   90:277475b5b93d
   1.147 -user:        Andy Buckley <andy@insectnation.org>
   1.148  date:        Wed Nov 17 11:38:09 2010 +0000
   1.149  summary:     Added pdflatex, kpsewhich and tikz.sty checks
   1.150  
   1.151 -changeset:   89:2dcc3b4a39e1
   1.152 -user:        Andy Buckley <andy@insectnation.org>
   1.153  date:        Wed Nov 03 09:49:41 2010 -0400
   1.154  summary:     Updating version number and removing need for pdfcrop
   1.155 -
   1.156 -changeset:   88:2fc528aeff43
   1.157 -user:        Andy Buckley <andy@insectnation.org>
   1.158 -date:        Wed Nov 03 09:47:14 2010 -0400
   1.159  summary:     Specifying a more appropriate paper size
   1.160 -
   1.161 -changeset:   87:1539d7d39a4d
   1.162 -user:        Andy Buckley <andy@insectnation.org>
   1.163 -date:        Wed Nov 03 09:42:06 2010 -0400
   1.164  summary:     PDF making ~working
   1.165 -
   1.166 -changeset:   86:3d72cd13b301
   1.167 -user:        Andy Buckley <andy@insectnation.org>
   1.168 -date:        Wed Nov 03 08:42:40 2010 -0400
   1.169  summary:     Various fixes and adding the user-preamble insert
   1.170  
   1.171 -changeset:   85:853dcde9ecab
   1.172 -user:        Andy Buckley <andy@insectnation.org>
   1.173  date:        Tue Nov 02 23:22:57 2010 -0400
   1.174  summary:     Added tag pyslha-0.5.1 for changeset 9a0c2171bd69
   1.175 -
   1.176 -changeset:   84:9a0c2171bd69
   1.177 -tag:         pyslha-0.5.1
   1.178 -user:        Andy Buckley <andy@insectnation.org>
   1.179 -date:        Tue Nov 02 23:22:50 2010 -0400
   1.180  summary:     Also natively plot from ISAWIG files: 0.5.1
   1.181 -
   1.182 -changeset:   83:bce9354d5c62
   1.183 -user:        Andy Buckley <andy@insectnation.org>
   1.184 -date:        Tue Nov 02 22:25:01 2010 -0400
   1.185  summary:     Now that we have TikZ, I think it's time for a version increment to 0.5.0
   1.186 -
   1.187 -changeset:   82:f509c83df334
   1.188 -user:        Andy Buckley <andy@insectnation.org>
   1.189 -date:        Tue Nov 02 22:03:53 2010 -0400
   1.190  summary:     TikZ mode version 1 done! That was easy...
   1.191 -
   1.192 -changeset:   81:25824dcffc50
   1.193 -user:        Andy Buckley <andy@insectnation.org>
   1.194 -date:        Tue Nov 02 15:01:05 2010 -0400
   1.195  summary:     Adding decay arrows in TikZ
   1.196 -
   1.197 -changeset:   80:984734fd9e54
   1.198 -user:        Andy Buckley <andy@insectnation.org>
   1.199 -date:        Tue Nov 02 14:52:12 2010 -0400
   1.200  summary:     TikZ plotting underway. x-coord overhaul required.
   1.201 -
   1.202 -changeset:   79:4c8efdea3860
   1.203 -user:        Andy Buckley <andy@insectnation.org>
   1.204 -date:        Tue Nov 02 00:28:56 2010 -0400
   1.205  summary:     Started putting in TikZ rendering
   1.206  
   1.207 -changeset:   78:77c41d9d3a9a
   1.208 -user:        Andy Buckley <andy@insectnation.org>
   1.209  date:        Thu Oct 07 10:10:52 2010 +0200
   1.210  summary:     Added tag pyslha-0.4.4 for changeset 3d3926a3e605
   1.211 -
   1.212 -changeset:   77:3d3926a3e605
   1.213 -tag:         pyslha-0.4.4
   1.214 -user:        Andy Buckley <andy@insectnation.org>
   1.215 -date:        Thu Oct 07 10:10:44 2010 +0200
   1.216 -summary:     Ready to tag as 0.4.4
   1.217 -
   1.218 -changeset:   76:ac542d647211
   1.219 -user:        Andy Buckley <andy@insectnation.org>
   1.220 -date:        Thu Oct 07 10:09:51 2010 +0200
   1.221  summary:     Restructuring to allow for multiple output formats, plus some other tweaks
   1.222 -
   1.223 -changeset:   75:b5306216e581
   1.224 -user:        Andy Buckley <andy@insectnation.org>
   1.225 -date:        Thu Oct 07 09:25:40 2010 +0200
   1.226  summary:     Removing logscale
   1.227  
   1.228 -changeset:   74:8cd50a8e7f4c
   1.229 -user:        Andy Buckley <andy@insectnation.org>
   1.230  date:        Tue Oct 05 19:26:57 2010 +0200
   1.231  summary:     Added tag pyslha-0.4.3 for changeset 427216d07f43
   1.232 -
   1.233 -changeset:   73:427216d07f43
   1.234 -tag:         pyslha-0.4.3
   1.235 -user:        Andy Buckley <andy@insectnation.org>
   1.236 -date:        Tue Oct 05 18:56:00 2010 +0200
   1.237  summary:     Bug fixes
   1.238 -
   1.239 -changeset:   72:c7c1b5a58d26
   1.240 -user:        Andy Buckley <andy@insectnation.org>
   1.241 -date:        Tue Oct 05 00:12:48 2010 +0200
   1.242  summary:     Added tag pyslha-0.4.2 for changeset 1b83c1b0aa71
   1.243 -
   1.244 -changeset:   71:1b83c1b0aa71
   1.245 -tag:         pyslha-0.4.2
   1.246 -user:        Andy Buckley <andy@insectnation.org>
   1.247 -date:        Tue Oct 05 00:12:30 2010 +0200
   1.248  summary:     Adding more decay sorting and some guesstimated attempt at choosing the appropriate HW matrix element code.
   1.249  
   1.250 -changeset:   70:a3c3639b41a8
   1.251 -user:        Andy Buckley <andy@insectnation.org>
   1.252  date:        Mon Oct 04 23:29:32 2010 +0200
   1.253  summary:     Adding 3 body gluino decay sorting
   1.254 -
   1.255 -changeset:   69:7eb24d7660e5
   1.256 -user:        Andy Buckley <andy@insectnation.org>
   1.257 -date:        Mon Oct 04 22:34:52 2010 +0200
   1.258  summary:     Added tag pyslha-0.4.1 for changeset 03bafdeeffa2
   1.259 -
   1.260 -changeset:   68:03bafdeeffa2
   1.261 -tag:         pyslha-0.4.1
   1.262 -user:        Andy Buckley <andy@insectnation.org>
   1.263 -date:        Mon Oct 04 22:34:45 2010 +0200
   1.264  summary:     Not requiring the with statement, to aid backwards compatibility
   1.265 -
   1.266 -changeset:   67:2733e0ddb7f9
   1.267 -user:        Andy Buckley <andy@insectnation.org>
   1.268 -date:        Mon Oct 04 09:29:35 2010 +0100
   1.269 -summary:     Tidying sorting table
   1.270 -
   1.271 -changeset:   66:7c829ecb90e1
   1.272 -user:        Andy Buckley <andy@insectnation.org>
   1.273 -date:        Mon Oct 04 09:20:20 2010 +0100
   1.274  summary:     Adding first HERWIG decay order sorting
   1.275  
   1.276 -changeset:   65:68e31d11dc8e
   1.277 -user:        Andy Buckley <andy@insectnation.org>
   1.278  date:        Tue Sep 28 17:00:37 2010 +0100
   1.279  summary:     Added tag pyslha-0.4.0 for changeset 279a1614bca4
   1.280 -
   1.281 -changeset:   64:279a1614bca4
   1.282 -tag:         pyslha-0.4.0
   1.283 -user:        Andy Buckley <andy@insectnation.org>
   1.284 -date:        Tue Sep 28 17:00:29 2010 +0100
   1.285  summary:     Incrementing release again, and doc upgrades, adding currently unused --format flag, etc.
   1.286 -
   1.287 -changeset:   63:0a71756f9792
   1.288 -user:        Andy Buckley <andy@insectnation.org>
   1.289 -date:        Tue Sep 28 16:52:52 2010 +0100
   1.290 -summary:     Note extra TODO
   1.291 -
   1.292 -changeset:   62:c43f2158198e
   1.293 -user:        Andy Buckley <andy@insectnation.org>
   1.294 -date:        Tue Sep 28 16:51:52 2010 +0100
   1.295  summary:     Option reworking / clean-up
   1.296  
   1.297 -changeset:   61:2b7dd5b24d5a
   1.298 -user:        Andy Buckley <andy@insectnation.org>
   1.299  date:        Tue Sep 28 16:32:12 2010 +0100
   1.300  summary:     Even more cunning rearrangement of labels
   1.301  
   1.302 -changeset:   60:0dd2d96a6abc
   1.303 -user:        Andy Buckley <andy@insectnation.org>
   1.304  date:        Mon Sep 27 10:48:44 2010 +0100
   1.305  summary:     A slightly more sophisticated attempt at label shifting for collision avoidance
   1.306  
   1.307 -changeset:   59:def024f5c406
   1.308 -user:        Andy Buckley <andy@insectnation.org>
   1.309 -date:        Sun Sep 26 23:05:13 2010 +0100
   1.310 -summary:     Adding ordering/ME instructions from the web page
   1.311 -
   1.312 -changeset:   58:7be870237705
   1.313 -user:        Andy Buckley <andy@insectnation.org>
   1.314 -date:        Fri Sep 24 00:49:19 2010 +0100
   1.315 -summary:     Added tag pyslha-0.3.0 for changeset 5dca7fe40267
   1.316 -
   1.317 -changeset:   57:5dca7fe40267
   1.318 -tag:         pyslha-0.3.0
   1.319 -user:        Andy Buckley <andy@insectnation.org>
   1.320  date:        Fri Sep 24 00:49:11 2010 +0100
   1.321  summary:     Version update for the merged label plotting since the output is so much improved
   1.322 -
   1.323 -changeset:   56:a0cc03e4f181
   1.324 -user:        Andy Buckley <andy@insectnation.org>
   1.325 -date:        Fri Sep 24 00:45:46 2010 +0100
   1.326 -summary:     Removing messy commented printouts
   1.327 -
   1.328 -changeset:   55:9056fa2e78b1
   1.329 -user:        Andy Buckley <andy@insectnation.org>
   1.330 -date:        Fri Sep 24 00:44:30 2010 +0100
   1.331  summary:     Label collision avoidance by merging
   1.332  
   1.333 -changeset:   54:e43dd20aa3be
   1.334 -user:        Andy Buckley <andy@insectnation.org>
   1.335  date:        Tue Sep 14 19:10:33 2010 +0100
   1.336 -summary:     Added tag pyslha-0.2.4 for changeset 65071135836a
   1.337 -
   1.338 -changeset:   53:65071135836a
   1.339 -tag:         pyslha-0.2.4
   1.340 -user:        Andy Buckley <andy@insectnation.org>
   1.341 -date:        Tue Sep 14 19:09:47 2010 +0100
   1.342 -summary:     Tweak to author list
   1.343 -
   1.344 -changeset:   52:b52629730828
   1.345 -user:        Andy Buckley <andy@insectnation.org>
   1.346 -date:        Tue Sep 14 19:09:33 2010 +0100
   1.347  summary:     Tweak to how docstrings are handled between the module and the setup file
   1.348 -
   1.349 -changeset:   51:6afa257d5407
   1.350 -user:        Andy Buckley <andy@insectnation.org>
   1.351 -date:        Tue Sep 14 18:57:22 2010 +0100
   1.352 -summary:     Added tag pyslha-0.2.3 for changeset 14916902dfd8
   1.353 -
   1.354 -changeset:   50:14916902dfd8
   1.355 -tag:         pyslha-0.2.3
   1.356 -user:        Andy Buckley <andy@insectnation.org>
   1.357 -date:        Tue Sep 14 18:57:11 2010 +0100
   1.358 -summary:     Another version bump
   1.359 -
   1.360 -changeset:   49:1f1923985bb3
   1.361 -user:        Andy Buckley <andy@insectnation.org>
   1.362 -date:        Tue Sep 14 18:56:41 2010 +0100
   1.363 -summary:     Tidying docstrings etc.
   1.364 -
   1.365 -changeset:   48:8f42d73776cd
   1.366 -user:        Andy Buckley <andy@insectnation.org>
   1.367 -date:        Tue Sep 14 18:54:12 2010 +0100
   1.368  summary:     Moving ISAWIG writer functions into module
   1.369 -
   1.370 -changeset:   47:9fa86bba2fe9
   1.371 -user:        Andy Buckley <andy@insectnation.org>
   1.372 -date:        Tue Sep 14 18:37:36 2010 +0100
   1.373  summary:     A few typo fixes, including a regex omission which was blocking 'cyclic' SLHA -> ISA -> SLHA -> ... conversions
   1.374  
   1.375 -changeset:   46:8fe3fa4c8f5c
   1.376 -user:        Andy Buckley <andy@insectnation.org>
   1.377  date:        Thu Sep 09 18:39:31 2010 +0100
   1.378 -summary:     Added tag pyslha-0.2.1 for changeset 2e5321a72ae8
   1.379 -
   1.380 -changeset:   45:2e5321a72ae8
   1.381 -tag:         pyslha-0.2.1
   1.382 -user:        Andy Buckley <andy@insectnation.org>
   1.383 -date:        Thu Sep 09 18:38:58 2010 +0100
   1.384 -summary:     Version update for distribution as 0.2.1
   1.385 -
   1.386 -changeset:   44:4afd2d1b888f
   1.387 -user:        Andy Buckley <andy@insectnation.org>
   1.388 -date:        Thu Sep 09 18:28:39 2010 +0100
   1.389  summary:     Better name for minimum BR flag
   1.390 -
   1.391 -changeset:   43:8939c304e454
   1.392 -user:        Andy Buckley <andy@insectnation.org>
   1.393 -date:        Thu Sep 09 15:18:05 2010 +0100
   1.394  summary:     Making labels a bit smaller
   1.395 -
   1.396 -changeset:   42:0a0e5a13037e
   1.397 -user:        Andy Buckley <andy@insectnation.org>
   1.398 -date:        Thu Sep 09 15:17:04 2010 +0100
   1.399  summary:     Hiding x ticks
   1.400  
   1.401 -changeset:   41:090fac2f9406
   1.402 -user:        Andy Buckley <andy@insectnation.org>
   1.403 -date:        Wed Sep 01 18:34:03 2010 +0200
   1.404 -summary:     Fixing other issues
   1.405 -
   1.406 -changeset:   40:9bafcc6e8dd4
   1.407 -user:        Andy Buckley <andy@insectnation.org>
   1.408 -date:        Wed Sep 01 18:28:54 2010 +0200
   1.409 -summary:     Think the inconsistencies are now resolved
   1.410 -
   1.411 -changeset:   39:67d8e9f2808f
   1.412 -user:        Andy Buckley <andy@insectnation.org>
   1.413 -date:        Wed Aug 25 10:23:10 2010 +0100
   1.414 -summary:     It works... but what is the correct treatment for PIDs which are not found in the MASS/DECAY block?
   1.415 -
   1.416 -changeset:   38:81f25ea41991
   1.417 -user:        Andy Buckley <andy@insectnation.org>
   1.418  date:        Wed Aug 25 10:17:02 2010 +0100
   1.419  summary:     More improvements, and fixing ISAWIG ref file... but still some inconsistency
   1.420 +summary:     Fixes and tests... now problem with listed decays for particles with no mass/width entry
   1.421 +summary:     Reading of ISAWIG file to pyslha objects done
   1.422  
   1.423 -changeset:   37:8ae7673c3ff7
   1.424 -user:        Andy Buckley <andy@insectnation.org>
   1.425 -date:        Wed Aug 25 10:01:02 2010 +0100
   1.426 -summary:     Oops, last commit was accidental
   1.427 -
   1.428 -changeset:   36:2cc65c04fdda
   1.429 -user:        Andy Buckley <andy@insectnation.org>
   1.430 -date:        Wed Aug 25 10:00:45 2010 +0100
   1.431 -summary:     Fixes and tests... now problem with listed decays for particles with no mass/width entry
   1.432 -
   1.433 -changeset:   35:cf96924bd254
   1.434 -user:        Andy Buckley <andy@insectnation.org>
   1.435 -date:        Wed Aug 25 09:56:43 2010 +0100
   1.436 -summary:     Fixes and tests... now problem with listed decays for particles with no mass/width entry
   1.437 -
   1.438 -changeset:   34:9f96ba4e000b
   1.439 -user:        Andy Buckley <andy@insectnation.org>
   1.440 -date:        Wed Aug 25 09:44:57 2010 +0100
   1.441 -summary:     Reading of ISAWIG file to pyslha objects done (not tested)
   1.442 -
   1.443 -changeset:   33:80cd82d24675
   1.444 -user:        Andy Buckley <andy@insectnation.org>
   1.445 -date:        Sat Aug 21 19:01:12 2010 +0100
   1.446 -summary:     Improving!
   1.447 -
   1.448 -changeset:   32:34fa1801ce34
   1.449 -user:        Andy Buckley <andy@insectnation.org>
   1.450 -date:        Sat Aug 21 16:31:02 2010 +0100
   1.451 -summary:     Note to self re. ALPHA
   1.452 -
   1.453 -changeset:   31:7d41d901fdd0
   1.454 -user:        Andy Buckley <andy@insectnation.org>
   1.455 -date:        Sat Aug 21 16:30:21 2010 +0100
   1.456 -summary:     Adding ignorenobr and reformatting a bit
   1.457 -
   1.458 -changeset:   30:2e20779d3e6e
   1.459 -user:        Andy Buckley <andy@insectnation.org>
   1.460 -date:        Sat Aug 21 16:13:50 2010 +0100
   1.461 -summary:     Writing out mostly working: need a bit of thought again re. ALPHA
   1.462 -
   1.463 -changeset:   29:764234670c09
   1.464 -user:        Andy Buckley <andy@insectnation.org>
   1.465  date:        Sat Aug 21 15:37:36 2010 +0100
   1.466  summary:     More SLHA-writing implementation, plus a consistency check assertion on Decay.nda == len(Decay.ids)
   1.467 -
   1.468 -changeset:   28:f8332497d99a
   1.469 -user:        Andy Buckley <andy@insectnation.org>
   1.470 -date:        Sat Aug 21 14:01:02 2010 +0100
   1.471  summary:     Reading the first block of masses from the ISAWIG file format
   1.472  
   1.473 -changeset:   27:b42865fbf0c5
   1.474 -user:        Andy Buckley <andy@insectnation.org>
   1.475  date:        Fri Aug 20 15:36:22 2010 +0100
   1.476  summary:     Adding use of the distribute/setuptools system
   1.477 -
   1.478 -changeset:   26:ffc5e155db55
   1.479 -user:        Andy Buckley <andy@insectnation.org>
   1.480 -date:        Fri Aug 20 15:32:50 2010 +0100
   1.481  summary:     Adding setup file, and adding version number variable to pyslha module
   1.482 -
   1.483 -changeset:   25:9cc7f244e8e4
   1.484 -user:        Andy Buckley <andy@insectnation.org>
   1.485 -date:        Fri Aug 20 15:24:04 2010 +0100
   1.486  summary:     More renamings, tidyings, and adding some structure to isawig2slha
   1.487 -
   1.488 -changeset:   24:49b13dabce0d
   1.489 -user:        Andy Buckley <andy@insectnation.org>
   1.490 -date:        Fri Aug 20 15:04:24 2010 +0100
   1.491  summary:     Rename slha2isa to make it explicit that the format that will be written is that for ISAWIG rather than the non-machine-readable format written out by ISASUSY
   1.492  
   1.493 -changeset:   23:2cea6e4a0450
   1.494 -user:        Andy Buckley <andy@insectnation.org>
   1.495 -date:        Tue Aug 17 16:28:06 2010 +0100
   1.496 -summary:     Moving sps1a.isa safely into the spcfiles directory
   1.497 -
   1.498 -changeset:   22:08847a6fbb84
   1.499 -user:        Andy Buckley <andy@insectnation.org>
   1.500 -date:        Tue Aug 17 16:27:40 2010 +0100
   1.501 -summary:     Reverting sps1a.isa
   1.502 -
   1.503 -changeset:   21:6b09c5faf4dc
   1.504 -user:        Andy Buckley <andy@insectnation.org>
   1.505  date:        Tue Aug 17 16:21:41 2010 +0100
   1.506  summary:     Add reading of SLHA from a string with readSLHA, and rename readSpcFile to readSLHAFile
   1.507  
   1.508 -changeset:   20:09afd2b9f490
   1.509 -user:        Andy Buckley <andy@insectnation.org>
   1.510 -date:        Mon Aug 16 09:28:44 2010 +0100
   1.511 -summary:     Adding (empty) isa2slha script
   1.512 -
   1.513 -changeset:   19:3964fa60e8e3
   1.514 -user:        Andy Buckley <andy@insectnation.org>
   1.515 -date:        Sat Aug 14 20:35:29 2010 +0100
   1.516 -summary:     Fixed (?) handling of ALPHA block
   1.517 -
   1.518 -changeset:   18:acc597c8dfbe
   1.519 -user:        Andy Buckley <andy@insectnation.org>
   1.520  date:        Sat Aug 14 20:28:30 2010 +0100
   1.521  summary:     Writing out remaining params: main missing bits are decay ID ordering (need a sorting function) and fixing the handling of the ALPHA block (no index, only one entry)
   1.522 -
   1.523 -changeset:   17:16f7792688de
   1.524 -user:        Andy Buckley <andy@insectnation.org>
   1.525 -date:        Sat Aug 14 20:05:47 2010 +0100
   1.526 -summary:     Note decay ID ordering requirement
   1.527 -
   1.528 -changeset:   16:5eeb5af2b2b2
   1.529 -user:        Andy Buckley <andy@insectnation.org>
   1.530 -date:        Sat Aug 14 19:21:01 2010 +0100
   1.531 -summary:     Note decay ID ordering requirement
   1.532 -
   1.533 -changeset:   15:b683f1ad49b0
   1.534 -user:        Andy Buckley <andy@insectnation.org>
   1.535 -date:        Sat Aug 14 19:20:34 2010 +0100
   1.536 -summary:     Note SUSY params
   1.537 -
   1.538 -changeset:   14:a9110d02eb62
   1.539 -user:        Andy Buckley <andy@insectnation.org>
   1.540 -date:        Sat Aug 14 19:09:47 2010 +0100
   1.541  summary:     slha2isa partially done
   1.542 -
   1.543 -changeset:   13:5dcaf77bbf2c
   1.544 -user:        Andy Buckley <andy@insectnation.org>
   1.545 -date:        Sat Aug 14 12:13:09 2010 +0100
   1.546  summary:     Better label positioning, command line options, writing to file
   1.547  
   1.548 -changeset:   12:558b3b392500
   1.549 -user:        Andy Buckley <andy@insectnation.org>
   1.550  date:        Wed Aug 11 14:59:28 2010 +0100
   1.551 -summary:     Added decays, and other tweaks
   1.552 -
   1.553 -changeset:   11:1748f31bf906
   1.554 -user:        Andy Buckley <andy@insectnation.org>
   1.555 -date:        Wed Aug 11 10:31:25 2010 +0100
   1.556 +summary:     Added decays, and other tweaks to slhaplot
   1.557  summary:     Use physical abs mass, set XMin, colour lines, slight horizontal offsets
   1.558  
   1.559 -changeset:   10:06612d6a2fc1
   1.560 -user:        Andy Buckley <andy@insectnation.org>
   1.561  date:        Tue Aug 10 20:43:45 2010 +0100
   1.562  summary:     Writing the initial form of slhaplot
   1.563  
   1.564 -changeset:   9:ea12598145c5
   1.565 -user:        Andy Buckley <andy@insectnation.org>
   1.566  date:        Tue Aug 03 17:30:04 2010 +0200
   1.567  summary:     Adding the start of a script to convert SLHA to ISASUSY format
   1.568 -
   1.569 -changeset:   8:c97f2f581685
   1.570 -user:        Andy Buckley <andy@insectnation.org>
   1.571 -date:        Tue Aug 03 17:29:41 2010 +0200
   1.572  summary:     Adding docstrings and making the Particle masses get populated via the MASS block contents
   1.573  
   1.574 -changeset:   7:a28827356061
   1.575 -user:        Andy Buckley <andy@insectnation.org>
   1.576 -date:        Tue Aug 03 01:27:48 2010 +0200
   1.577 -summary:     Tweaks to particle mass and width printout
   1.578 -
   1.579 -changeset:   6:1e9ee18259e2
   1.580 -user:        Andy Buckley <andy@insectnation.org>
   1.581  date:        Mon Aug 02 22:10:37 2010 +0200
   1.582  summary:     Decay parsing done
   1.583  
   1.584 -changeset:   5:825fed016ac1
   1.585 -user:        Andy Buckley <andy@insectnation.org>
   1.586  date:        Sun Aug 01 20:55:29 2010 +0200
   1.587  summary:     Handling Q= entries on block names
   1.588 -
   1.589 -changeset:   4:ff16e3d891cd
   1.590 -user:        Andy Buckley <andy@insectnation.org>
   1.591 -date:        Sun Aug 01 15:56:33 2010 +0200
   1.592  summary:     Automatic string to numeric type conversion
   1.593 -
   1.594 -changeset:   3:d52a5a633a6c
   1.595 -user:        Andy Buckley <andy@insectnation.org>
   1.596 -date:        Sun Aug 01 01:14:45 2010 +0200
   1.597 -summary:     Adding case-insensitivity
   1.598 -
   1.599 -changeset:   2:3eef12df64d5
   1.600 -user:        Andy Buckley <andy@insectnation.org>
   1.601 -date:        Sun Aug 01 01:06:04 2010 +0200
   1.602 -summary:     Adding several test input files
   1.603 -
   1.604 -changeset:   1:dee5706ae812
   1.605 -user:        Andy Buckley <andy@insectnation.org>
   1.606 -date:        Sun Aug 01 01:05:50 2010 +0200
   1.607  summary:     Making a basic block -> tree reader
   1.608 -
   1.609 -changeset:   0:c88183197787
   1.610 -user:        Andy Buckley <andy@insectnation.org>
   1.611 -date:        Wed Jul 07 23:02:32 2010 +0100
   1.612 -summary:     Adding placeholder Python source files
   1.613 -
     2.1 --- a/pyslha.py	Sat Feb 26 02:27:08 2011 +0100
     2.2 +++ b/pyslha.py	Sat Feb 26 23:21:12 2011 +0100
     2.3 @@ -23,7 +23,7 @@
     2.4  """
     2.5  
     2.6  __author__ = "Andy Buckley <andy.buckley@cern.ch"
     2.7 -__version__ = "1.0.7"
     2.8 +__version__ = "1.0.8"
     2.9  
    2.10  
    2.11  def _autotype(var):
    2.12 @@ -252,6 +252,7 @@
    2.13      return rtn
    2.14  
    2.15  
    2.16 +
    2.17  def readISAWIG(isastr, ignorenobr=False):
    2.18      """
    2.19      Read a spectrum definition from a string in the ISAWIG format, returning
    2.20 @@ -266,10 +267,31 @@
    2.21      branching ratio of zero.
    2.22      """
    2.23  
    2.24 -    ## PDG MC ID codes mapped to HERWIG SUSY ID codes, based on
    2.25 +    ## PDG MC ID codes mapped to HERWIG IDHW codes, based on
    2.26      ## http://www.hep.phy.cam.ac.uk/~richardn/HERWIG/ISAWIG/susycodes.html
    2.27 +    ## + the IDPDG array and section 4.13 of the HERWIG manual.
    2.28      HERWIGID2PDGID = {}
    2.29 -    HERWIGID2PDGID[203] =  25 ## HIGGSL0
    2.30 +    HERWIGID2PDGID[7]   = -1
    2.31 +    HERWIGID2PDGID[8]   = -2
    2.32 +    HERWIGID2PDGID[9]   = -3
    2.33 +    HERWIGID2PDGID[10]  = -4
    2.34 +    HERWIGID2PDGID[11]  = -5
    2.35 +    HERWIGID2PDGID[12]  = -6
    2.36 +    HERWIGID2PDGID[13]  =  21
    2.37 +    HERWIGID2PDGID[59]  =  22
    2.38 +    HERWIGID2PDGID[121] =  11
    2.39 +    HERWIGID2PDGID[122] =  12
    2.40 +    HERWIGID2PDGID[123] =  13
    2.41 +    HERWIGID2PDGID[124] =  14
    2.42 +    HERWIGID2PDGID[125] =  15
    2.43 +    HERWIGID2PDGID[126] =  16
    2.44 +    HERWIGID2PDGID[127] = -11
    2.45 +    HERWIGID2PDGID[128] = -12
    2.46 +    HERWIGID2PDGID[129] = -13
    2.47 +    HERWIGID2PDGID[130] = -14
    2.48 +    HERWIGID2PDGID[131] = -15
    2.49 +    HERWIGID2PDGID[132] = -16
    2.50 +    HERWIGID2PDGID[203] =  25 ## HIGGSL0 (== PDG standard in this direction)
    2.51      HERWIGID2PDGID[204] =  35 ## HIGGSH0
    2.52      HERWIGID2PDGID[205] =  36 ## HIGGSA0
    2.53      HERWIGID2PDGID[206] =  37 ## HIGGS+
    2.54 @@ -517,10 +539,31 @@
    2.55      If the ignorenobr parameter is True, do not write decay entries with a
    2.56      branching ratio of zero.
    2.57      """
    2.58 -    ## PDG MC ID codes mapped to HERWIG SUSY ID codes, based on
    2.59 +    ## PDG MC ID codes mapped to HERWIG IDHW codes, based on
    2.60      ## http://www.hep.phy.cam.ac.uk/~richardn/HERWIG/ISAWIG/susycodes.html
    2.61 +    ## + the IDPDG array and section 4.13 of the HERWIG manual.
    2.62      PDGID2HERWIGID = {}
    2.63 -    PDGID2HERWIGID[      25] = 203 ## HIGGSL0 (ADDED)
    2.64 +    PDGID2HERWIGID[      -1] = 7
    2.65 +    PDGID2HERWIGID[      -2] = 8
    2.66 +    PDGID2HERWIGID[      -3] = 9
    2.67 +    PDGID2HERWIGID[      -4] = 10
    2.68 +    PDGID2HERWIGID[      -5] = 11
    2.69 +    PDGID2HERWIGID[      -6] = 12
    2.70 +    PDGID2HERWIGID[      21] = 13
    2.71 +    PDGID2HERWIGID[      22] = 59
    2.72 +    PDGID2HERWIGID[      11] = 121
    2.73 +    PDGID2HERWIGID[      12] = 122
    2.74 +    PDGID2HERWIGID[      13] = 123
    2.75 +    PDGID2HERWIGID[      14] = 124
    2.76 +    PDGID2HERWIGID[      15] = 125
    2.77 +    PDGID2HERWIGID[      16] = 126
    2.78 +    PDGID2HERWIGID[     -11] = 127
    2.79 +    PDGID2HERWIGID[     -12] = 128
    2.80 +    PDGID2HERWIGID[     -13] = 129
    2.81 +    PDGID2HERWIGID[     -14] = 130
    2.82 +    PDGID2HERWIGID[     -15] = 131
    2.83 +    PDGID2HERWIGID[     -16] = 132
    2.84 +    PDGID2HERWIGID[      25] = 203 ## HIGGSL0 (added for PDG standard -> HERWIG IDHW)
    2.85      PDGID2HERWIGID[      26] = 203 ## HIGGSL0
    2.86      PDGID2HERWIGID[      35] = 204 ## HIGGSH0
    2.87      PDGID2HERWIGID[      36] = 205 ## HIGGSA0
     3.1 --- a/slhaplot	Sat Feb 26 02:27:08 2011 +0100
     3.2 +++ b/slhaplot	Sat Feb 26 23:21:12 2011 +0100
     3.3 @@ -145,9 +145,9 @@
     3.4                    "comma-separated list, and 'shift' vertically shifts the clashing labels to avoid "
     3.5                    "collisions (default: %default)",
     3.6                    dest="PARTICLES_LABELS", default="shift")
     3.7 -parser.add_option("--show-gravitino", action="store_true",
     3.8 -                  help="show the gravitino if available",
     3.9 -                  dest="SHOW_GRAVITINO", default=False)
    3.10 +# parser.add_option("--hide-gravitino", action="store_false",
    3.11 +#                   help="hide the gravitino",
    3.12 +#                   dest="SHOW_GRAVITINO", default=False)
    3.13  
    3.14  
    3.15  ## Run parser and sort out a few resulting details
    3.16 @@ -156,8 +156,8 @@
    3.17  opts.PARTICLES_LABELS_MERGE = (opts.PARTICLES_LABELS == "merge")
    3.18  opts.PARTICLES_LABELS_SHIFT = (opts.PARTICLES_LABELS == "shift")
    3.19  #
    3.20 -if not opts.SHOW_GRAVITINO:
    3.21 -    del PDETAILS[1000039]
    3.22 +# if not opts.SHOW_GRAVITINO:
    3.23 +#     del PDETAILS[1000039]
    3.24  #
    3.25  if opts.DECAYS_MINBR.endswith("%"):
    3.26      opts.DECAYS_MINBR = float(opts.DECAYS_MINBR[:-1]) / 100
    3.27 @@ -217,7 +217,7 @@
    3.28                      if PDETAILS.has_key(pid2):
    3.29                          xyto = (PDETAILS[pid2].xedges.centre, PDETAILS[pid2].mass)
    3.30                          DDETAILS[pid][pid2] = DecayDetails(pid, xyfrom, pid2, xyto, d.br)
    3.31 -    if not DDETAILS[pid]:
    3.32 +    if DDETAILS.has_key(pid) and not DDETAILS[pid]:
    3.33          del DDETAILS[pid]
    3.34  
    3.35  

mercurial