@@ -60,8 +60,8 @@ public class CRUSH extends Configurator implements BasicMessaging {
6060 */
6161 private static final long serialVersionUID = 6284421525275783456L ;
6262
63- private static String version = "2.42-1 " ;
64- private static String revision = "" ;
63+ private static String version = "2.42-2 " ;
64+ private static String revision = "devel.2 " ;
6565
6666 public static String workPath = "." ;
6767 public static String home = "." ;
@@ -84,26 +84,8 @@ public class CRUSH extends Configurator implements BasicMessaging {
8484 private int configDepth = 0 ; // Used for 'nested' output of invoked configurations.
8585
8686
87- public static void main (String [] args ) {
88- info ();
89-
90- Util .setReporter (broadcaster );
91-
92- if (args .length == 0 ) {
93- usage ();
94- new CRUSH ().checkJavaVM (0 );
95- System .exit (0 );
96- }
97-
98- if (args [0 ].equalsIgnoreCase ("-help" )) {
99- help (null );
100- System .exit (0 );
101- }
102-
103- home = System .getenv ("CRUSH" );
104- if (home == null ) home = "." ;
105-
106- CRUSH crush = new CRUSH (args [0 ]);
87+ public static void main (String [] args ) {
88+ CRUSH crush = new CRUSH ();
10789
10890 crush .checkJavaVM (5 );
10991 crush .checkForUpdates ();
@@ -114,19 +96,78 @@ public static void main(String[] args) {
11496 }
11597 catch (Exception e ) { crush .error (e ); }
11698
99+ crush .shutdown ();
100+
117101 // TODO should not be needed if background processes are all wrapped up...
118- crush .exit (0 );
102+ System .exit (0 );
119103 }
120104
121- private CRUSH () {
105+ public CRUSH () {
106+ info ();
107+
122108 Locale .setDefault (Locale .US );
123109 FitsFactory .setUseHierarch (true );
124110 FitsFactory .setLongStringsEnabled (true );
111+
112+ Util .setReporter (broadcaster );
113+
114+ home = System .getenv ("CRUSH" );
115+ if (home == null ) home = "." ;
116+ }
117+
118+ /**
119+ * Initialize CRUSH for the given instrument, and no extra options...
120+ *
121+ * @param instrumentName The instrument to use CRUSH with, e.g. "sharc2", or "hirmes"
122+ * @throws Exception If CRUSH could not be initialized with the specified instrument name.
123+ */
124+ public final void init (String instrumentName ) throws Exception {
125+ init (new String [] { instrumentName });
125126 }
127+
128+ /**
129+ * Same as {@link init(String[])} except the arguments as specified as a List rather than
130+ * an array.
131+ * @see init(String[])
132+ *
133+ * @param args A list of arguments, like on the command-line. See {@link init(String[]) for
134+ * more.
135+ * @throws Exception An exception indicative of a problem encountered during initialization.
136+ */
137+ public final void init (List <String > args ) throws Exception {
138+ String [] array = new String [args .size ()];
139+ args .toArray (array );
140+ init (array );
141+ }
142+
143+
144+ /**
145+ * Initialize CRUSH for the given argument list, as if the list were command-line arguments.
146+ *
147+ *
148+ * @param args The list of argument to initialize CRUSH with. The first argument must be the
149+ * instrument name to use CRUSH with, e.g. "sharc2" or "hirmes", or else "-help"
150+ * to print just a help screen. The arguments that follow must either be options,
151+ * starting with a dash ('-'), or else scan specifiers. E.g.
152+ *
153+ * { "hirmes", "-faint", "-flight=405", "68", "70-77" }
154+ *
155+ * @throws Exception An exception indicative of a problem encountered during initialization.
156+ */
157+ public void init (String [] args ) throws Exception {
126158
127- public CRUSH (String instrumentName ) {
128- this ();
159+ if (args .length == 0 ) {
160+ usage ();
161+ System .exit (0 );
162+ }
129163
164+ if (args [0 ].equalsIgnoreCase ("-help" )) {
165+ help (null );
166+ System .exit (0 );
167+ }
168+
169+ String instrumentName = args [0 ];
170+
130171 instrument = Instrument .forName (instrumentName .toLowerCase ());
131172 instrument .setOptions (this );
132173
@@ -135,16 +176,8 @@ public CRUSH(String instrumentName) {
135176 System .exit (1 );
136177 }
137178
138- info (this , "Instrument is " + instrument .getName ().toUpperCase ());
139- }
140-
141- public boolean hasOption (String name ) {
142- return isConfigured (name );
143- }
144-
145- public Configurator option (String name ) { return get (name ); }
146-
147- public void init (String [] args )throws Exception {
179+ info (this , "Instrument is " + instrument .getName ().toUpperCase ());
180+
148181 readConfig ("default.cfg" );
149182
150183 this .args = args ;
@@ -153,6 +186,14 @@ public void init(String[] args)throws Exception {
153186 validate ();
154187 }
155188
189+ public boolean hasOption (String name ) {
190+ return isConfigured (name );
191+ }
192+
193+ public Configurator option (String name ) { return get (name ); }
194+
195+
196+
156197 private void parseArgument (String arg ) {
157198 if (arg .charAt (0 ) == '-' ) parseSilent (arg .substring (1 ));
158199 else read (arg );
@@ -1003,10 +1044,13 @@ public void editHeader(Header header) throws HeaderCardException {
10031044 c .add (new HeaderCard ("COMMENT" , " ----------------------------------------------------" , false ));
10041045 }
10051046
1006-
1007- public void exit (int exitValue ) {
1047+ public void shutdown () {
10081048 if (instrument != null ) instrument .shutdown ();
10091049 Util .setDefaultReporter ();
1050+ }
1051+
1052+ public void exit (int exitValue ) {
1053+ shutdown ();
10101054 System .exit (exitValue );
10111055 }
10121056
@@ -1123,9 +1167,9 @@ public final void process(int threads, ExecutorService executor) {
11231167 public static void remove (Reporter r ) { broadcaster .remove (r ); }
11241168
11251169 public static void removeReporter (String id ) { broadcaster .remove (id ); }
1170+
11261171
1127-
1128-
1172+
11291173 public static CRUSHConsoleReporter consoleReporter = new CRUSHConsoleReporter ("crush-console" );
11301174 public static Broadcaster broadcaster = new Broadcaster ("CRUSH-broadcast" , consoleReporter );
11311175
0 commit comments