Author: [log in to unmask]
Date: Wed Oct 26 08:56:07 2016
New Revision: 4534
Log:
Removed a number of old, unused drivers from users.kmccarty and updated DatabaseDAQConfigDriver to remove tabs.
Removed:
java/trunk/users/src/main/java/org/hps/users/kmccarty/InvariantMassPairDriver.java
java/trunk/users/src/main/java/org/hps/users/kmccarty/MTEAnalysis.java
java/trunk/users/src/main/java/org/hps/users/kmccarty/MTETriggerPlotsFormatter.java
java/trunk/users/src/main/java/org/hps/users/kmccarty/RafoAnalysis.java
java/trunk/users/src/main/java/org/hps/users/kmccarty/TridentTrackDriver.java
java/trunk/users/src/main/java/org/hps/users/kmccarty/TriggerPlotsModule.java
Modified:
java/trunk/users/src/main/java/org/hps/users/kmccarty/DatabaseDAQConfigDriver.java
Modified: java/trunk/users/src/main/java/org/hps/users/kmccarty/DatabaseDAQConfigDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/kmccarty/DatabaseDAQConfigDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/kmccarty/DatabaseDAQConfigDriver.java Wed Oct 26 08:56:07 2016
@@ -15,28 +15,28 @@
import java.io.StringReader;
public class DatabaseDAQConfigDriver extends DAQConfigDriver {
- // Define the crate enumerables by crate number. Crates are
- // in the order 46, 37, 39.
- private static final Crate[] CRATES = { Crate.CONFIG3, Crate.CONFIG1, Crate.CONFIG2 };
-
- @Override
- public void detectorChanged(Detector detector) {
- // Make sure that the run number is defined.
- if(getRunNumber() == -1) { throw new IllegalArgumentException("Run number is undefined."); }
-
- // Get the trigger configuration data.
- RunManager manager = new RunManager();
- manager.setRun(getRunNumber());
- DaoProvider factory = new DaoProvider(manager.getConnection());
- TriggerConfigData triggerConfig = factory.getTriggerConfigDao().getTriggerConfig(RunManager.getRunManager().getRun());
-
- // Convert the trigger configuration text blocks into individual
- // strings.
- String[][] data = null;
- try { data = getDataFileArrays(triggerConfig); }
- catch(IOException e) {
- throw new RuntimeException("An error occurred when processing the trigger data.");
- }
+ // Define the crate enumerables by crate number. Crates are
+ // in the order 46, 37, 39.
+ private static final Crate[] CRATES = { Crate.CONFIG3, Crate.CONFIG1, Crate.CONFIG2 };
+
+ @Override
+ public void detectorChanged(Detector detector) {
+ // Make sure that the run number is defined.
+ if(getRunNumber() == -1) { throw new IllegalArgumentException("Run number is undefined."); }
+
+ // Get the trigger configuration data.
+ RunManager manager = new RunManager();
+ manager.setRun(getRunNumber());
+ DaoProvider factory = new DaoProvider(manager.getConnection());
+ TriggerConfigData triggerConfig = factory.getTriggerConfigDao().getTriggerConfig(RunManager.getRunManager().getRun());
+
+ // Convert the trigger configuration text blocks into individual
+ // strings.
+ String[][] data = null;
+ try { data = getDataFileArrays(triggerConfig); }
+ catch(IOException e) {
+ throw new RuntimeException("An error occurred when processing the trigger data.");
+ }
// Instantiate an EvIO DAQ parser and feed it the data.
EvioDAQParser daqConfig = new EvioDAQParser();
@@ -49,31 +49,31 @@
// Close the manager.
manager.closeConnection();
- }
-
- @Override
- public void process(EventHeader event) { }
-
- private static final String[][] getDataFileArrays(TriggerConfigData triggerConfig) throws IOException {
+ }
+
+ @Override
+ public void process(EventHeader event) { }
+
+ private static final String[][] getDataFileArrays(TriggerConfigData triggerConfig) throws IOException {
// Create file readers to process the data files.
- StringReader[] fr = new StringReader[3];
+ StringReader[] fr = new StringReader[3];
BufferedReader[] reader = new BufferedReader[3];
for(int i = 0; i < 3; i++) {
- fr[i] = new StringReader(triggerConfig.getData().get(CRATES[i]));
+ fr[i] = new StringReader(triggerConfig.getData().get(CRATES[i]));
reader[i] = new BufferedReader(fr[i]);
}
-
- // Convert the crate data into an array of strings. These must
- // be in the order of 46, 37, 39.
+
+ // Convert the crate data into an array of strings. These must
+ // be in the order of 46, 37, 39.
String[][] data = getDataFileArrays(reader);
-
- // Close the readers.
- for(int i = 0; i < 3; i++) {
- reader[i].close();
- fr[i].close();
- }
-
- // Return the converted data.
- return data;
- }
-}
+
+ // Close the readers.
+ for(int i = 0; i < 3; i++) {
+ reader[i].close();
+ fr[i].close();
+ }
+
+ // Return the converted data.
+ return data;
+ }
+}
|