Author: [log in to unmask]
Date: Thu Oct 15 16:46:40 2015
New Revision: 3846
Log:
Replace inappropriate System.exit calls with exceptions.
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRunningPedestalDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/IterateGainFactorDriver.java
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java Thu Oct 15 16:46:40 2015
@@ -83,8 +83,7 @@
public void endOfData() {
Console cc = System.console();
if (cc == null) {
- System.err.println("No console.");
- System.exit(1);
+ throw new IllegalStateException("Could not access system console.");
}
System.err.println("\n\n\n***************************************************************\n");
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRunningPedestalDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRunningPedestalDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRunningPedestalDriver.java Thu Oct 15 16:46:40 2015
@@ -165,8 +165,7 @@
for (RawTrackerHit hit : hits) {
short samples[] = hit.getADCValues();
if (nSamples > samples.length) {
- System.err.println("NOT ENGOUTH SAMPLES FOR ECAL RUNNING PEDETSAL.");
- System.exit(0);
+ throw new IllegalStateException("Not enough samples for ECal running pedestal.");
}
//double ped = getNSampleMinimum(samples);
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/IterateGainFactorDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/IterateGainFactorDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/IterateGainFactorDriver.java Thu Oct 15 16:46:40 2015
@@ -85,8 +85,7 @@
final int channelid = Integer.valueOf(columns[0]);
final double gain = Double.valueOf(columns[1]);
if (gainFileGains.containsKey(channelid)) {
- System.err.println("Duplicate Entries in ECal Gain File.");
- System.exit(2);
+ throw new RuntimeException("Duplicate Entries in ECal Gain File.");
}
gainFileGains.put(channelid,gain);
}
|