Author: [log in to unmask] Date: Wed Jan 6 10:22:18 2016 New Revision: 4094 Log: reduce clutter Added: java/trunk/users/src/main/java/org/hps/users/phansson/GblResidualDriver.java - copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ECalExtrapolationDriver.java java/trunk/users/src/main/java/org/hps/users/phansson/alignment/ReadSurveyRotations.java - copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ReadSurveyRotations.java java/trunk/users/src/main/java/org/hps/users/phansson/apps/ java/trunk/users/src/main/java/org/hps/users/phansson/apps/RegExpMatcherTester.java - copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/RegExpMatcherTester.java java/trunk/users/src/main/java/org/hps/users/phansson/apps/TestSort.java - copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/TestSort.java java/trunk/users/src/main/java/org/hps/users/phansson/tools/ java/trunk/users/src/main/java/org/hps/users/phansson/tools/DumpAIDATextFiles.java - copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/DumpAIDATextFiles.java java/trunk/users/src/main/java/org/hps/users/phansson/tools/ROOTFlatTupleDriver.java - copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java java/trunk/users/src/main/java/org/hps/users/phansson/tools/TrackingGeometryChecker.java - copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/TrackingGeometryChecker.java java/trunk/users/src/main/java/org/hps/users/phansson/tools/mergeSimpleAIDA.java - copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java Removed: java/trunk/users/src/main/java/org/hps/users/phansson/DumpAIDATextFiles.java java/trunk/users/src/main/java/org/hps/users/phansson/ECalExtrapolationDriver.java java/trunk/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java java/trunk/users/src/main/java/org/hps/users/phansson/ReadSurveyRotations.java java/trunk/users/src/main/java/org/hps/users/phansson/RegExpMatcherTester.java java/trunk/users/src/main/java/org/hps/users/phansson/TestSort.java java/trunk/users/src/main/java/org/hps/users/phansson/TrackingGeometryChecker.java java/trunk/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java Copied: java/trunk/users/src/main/java/org/hps/users/phansson/GblResidualDriver.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ECalExtrapolationDriver.java) ============================================================================= --- java/trunk/users/src/main/java/org/hps/users/phansson/ECalExtrapolationDriver.java (original) +++ java/trunk/users/src/main/java/org/hps/users/phansson/GblResidualDriver.java Wed Jan 6 10:22:18 2016 @@ -36,9 +36,9 @@ * @author Per Hansson Adrian <[log in to unmask]> * */ -public class ECalExtrapolationDriver extends Driver { - - private static Logger logger = Logger.getLogger(ECalExtrapolationDriver.class.getName()); +public class GblResidualDriver extends Driver { + + private static Logger logger = Logger.getLogger(GblResidualDriver.class.getName()); private double bfield; @@ -64,7 +64,7 @@ /** * */ - public ECalExtrapolationDriver() { + public GblResidualDriver() { logger.setLevel(Level.INFO); } Copied: java/trunk/users/src/main/java/org/hps/users/phansson/alignment/ReadSurveyRotations.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ReadSurveyRotations.java) ============================================================================= --- java/trunk/users/src/main/java/org/hps/users/phansson/ReadSurveyRotations.java (original) +++ java/trunk/users/src/main/java/org/hps/users/phansson/alignment/ReadSurveyRotations.java Wed Jan 6 10:22:18 2016 @@ -1,7 +1,7 @@ /** * */ -package org.hps.users.phansson; +package org.hps.users.phansson.alignment; import hep.physics.vec.BasicHep3Vector; import hep.physics.vec.Hep3Vector; Copied: java/trunk/users/src/main/java/org/hps/users/phansson/apps/RegExpMatcherTester.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/RegExpMatcherTester.java) ============================================================================= --- java/trunk/users/src/main/java/org/hps/users/phansson/RegExpMatcherTester.java (original) +++ java/trunk/users/src/main/java/org/hps/users/phansson/apps/RegExpMatcherTester.java Wed Jan 6 10:22:18 2016 @@ -1,4 +1,4 @@ -package org.hps.users.phansson; +package org.hps.users.phansson.apps; import java.util.regex.Matcher; import java.util.regex.Pattern; Copied: java/trunk/users/src/main/java/org/hps/users/phansson/apps/TestSort.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/TestSort.java) ============================================================================= --- java/trunk/users/src/main/java/org/hps/users/phansson/TestSort.java (original) +++ java/trunk/users/src/main/java/org/hps/users/phansson/apps/TestSort.java Wed Jan 6 10:22:18 2016 @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.hps.users.phansson; +package org.hps.users.phansson.apps; import java.util.ArrayList; import java.util.Collections; Copied: java/trunk/users/src/main/java/org/hps/users/phansson/tools/DumpAIDATextFiles.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/DumpAIDATextFiles.java) ============================================================================= --- java/trunk/users/src/main/java/org/hps/users/phansson/DumpAIDATextFiles.java (original) +++ java/trunk/users/src/main/java/org/hps/users/phansson/tools/DumpAIDATextFiles.java Wed Jan 6 10:22:18 2016 @@ -1,4 +1,4 @@ -package org.hps.users.phansson; +package org.hps.users.phansson.tools; import hep.aida.IAnalysisFactory; import hep.aida.IHistogram1D; Copied: java/trunk/users/src/main/java/org/hps/users/phansson/tools/ROOTFlatTupleDriver.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java) ============================================================================= --- java/trunk/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java (original) +++ java/trunk/users/src/main/java/org/hps/users/phansson/tools/ROOTFlatTupleDriver.java Wed Jan 6 10:22:18 2016 @@ -1,4 +1,4 @@ -package org.hps.users.phansson; +package org.hps.users.phansson.tools; import hep.aida.IHistogram1D; import hep.aida.IHistogram2D; @@ -32,6 +32,7 @@ import org.hps.recon.vertexing.TwoTrackVertexer; import org.hps.record.triggerbank.AbstractIntData; import org.hps.record.triggerbank.TestRunTriggerData; +import org.hps.users.phansson.TrigRateDriver; import org.lcsim.detector.IDetectorElement; import org.lcsim.detector.identifier.IExpandedIdentifier; import org.lcsim.detector.identifier.IIdentifierHelper; Copied: java/trunk/users/src/main/java/org/hps/users/phansson/tools/TrackingGeometryChecker.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/TrackingGeometryChecker.java) ============================================================================= --- java/trunk/users/src/main/java/org/hps/users/phansson/TrackingGeometryChecker.java (original) +++ java/trunk/users/src/main/java/org/hps/users/phansson/tools/TrackingGeometryChecker.java Wed Jan 6 10:22:18 2016 @@ -1,4 +1,4 @@ -package org.hps.users.phansson; +package org.hps.users.phansson.tools; import java.util.ArrayList; import java.util.List; Copied: java/trunk/users/src/main/java/org/hps/users/phansson/tools/mergeSimpleAIDA.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java) ============================================================================= --- java/trunk/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java (original) +++ java/trunk/users/src/main/java/org/hps/users/phansson/tools/mergeSimpleAIDA.java Wed Jan 6 10:22:18 2016 @@ -1,4 +1,4 @@ -package org.hps.users.phansson; +package org.hps.users.phansson.tools; import hep.aida.IAnalysisFactory; import hep.aida.IHistogram;