118 |
|
if (sele2Env) { |
119 |
|
sele2 = sele2Env; |
120 |
|
} else { |
121 |
< |
//It seems likely (from previous discussions) that if sele2 is not specified, then the default behavior |
122 |
< |
//should not be 'select all' but rather what is already intended for sele1 |
123 |
< |
//JRM 8/22/12 |
121 |
> |
//If sele2 is not specified, then the default behavior |
122 |
> |
//should be what is already intended for sele1 |
123 |
|
sele2 = sele1; |
124 |
|
//sele2 = "select all"; |
125 |
|
} |
236 |
|
if (args_info.sele2_given) |
237 |
|
analyser = new P2OrderParameter(info, dumpFileName, sele1, sele2); |
238 |
|
else |
239 |
< |
analyser = new P2OrderParameter(info, dumpFileName, sele1); |
239 |
> |
if (args_info.seleoffset_given) |
240 |
> |
analyser = new P2OrderParameter(info, dumpFileName, sele1, |
241 |
> |
args_info.seleoffset_arg); |
242 |
> |
else |
243 |
> |
analyser = new P2OrderParameter(info, dumpFileName, sele1); |
244 |
|
} else { |
245 |
|
sprintf( painCave.errMsg, |
246 |
|
"At least one selection script (--sele1) must be specified when calculating P2 order parameters"); |