Author: [log in to unmask]
Date: Wed Mar 9 12:53:22 2016
New Revision: 4279
Log:
[HPSJAVA-532] Remove unused imports from core modules.
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DQMDatabaseManager.java
java/trunk/analysis/src/main/java/org/hps/analysis/examples/PrintGeometryDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/examples/StripGoldenEventsDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/ComponentUtils.java
java/trunk/conditions/src/main/java/org/hps/conditions/database/AbstractConditionsObjectConverter.java
java/trunk/crawler/src/main/java/org/hps/crawler/LcioReconMetadataReader.java
java/trunk/crawler/src/main/java/org/hps/crawler/RootDstMetadataReader.java
java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java
java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014Converter.java
java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTrackerConverter.java
java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java
java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/scalers/DeadtimePlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/SVTOpeningAlignment.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackResiduals.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/V0ReconPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java
java/trunk/recon/src/main/java/org/hps/recon/filtering/PulserScalerAndEpicsFilter.java
java/trunk/recon/src/main/java/org/hps/recon/filtering/SvtRawHitMultiplicityFilter.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackDataDriver.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLFileIO.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLTrackData.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/matrix/Matrix.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/matrix/Vector.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/STUtils.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/StraightThroughAnalysisDriver.java
java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java
java/trunk/util/src/main/java/org/hps/util/ConvertToStdhep.java
java/trunk/util/src/main/java/org/hps/util/LCIOFilterDriver.java
java/trunk/util/src/main/java/org/hps/util/MergeBunches.java
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DQMDatabaseManager.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DQMDatabaseManager.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DQMDatabaseManager.java Wed Mar 9 12:53:22 2016
@@ -7,10 +7,7 @@
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Formatter;
import java.util.logging.Level;
-import java.util.logging.LogRecord;
import java.util.logging.Logger;
import org.hps.conditions.api.TableMetaData;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/examples/PrintGeometryDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/examples/PrintGeometryDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/examples/PrintGeometryDriver.java Wed Mar 9 12:53:22 2016
@@ -2,8 +2,9 @@
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
-import java.util.ArrayList;
+
import java.util.List;
+
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.ITransform3D;
import org.lcsim.detector.Transform3D;
@@ -13,13 +14,7 @@
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;
-import org.lcsim.event.RawTrackerHit;
-import org.lcsim.event.SimTrackerHit;
-import org.lcsim.event.base.BaseRawTrackerHit;
import org.lcsim.geometry.Detector;
-import org.hps.recon.tracking.MaterialSupervisor;
-import org.hps.recon.tracking.TrackerHitUtils;
-import org.lcsim.recon.tracking.digitization.sisim.TrackerHitType;
import org.lcsim.util.Driver;
/**
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/examples/StripGoldenEventsDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/examples/StripGoldenEventsDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/examples/StripGoldenEventsDriver.java Wed Mar 9 12:53:22 2016
@@ -1,11 +1,11 @@
package org.hps.analysis.examples;
import java.util.List;
+
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.event.ReconstructedParticle;
import org.lcsim.event.Track;
-import org.lcsim.event.Vertex;
import org.lcsim.util.Driver;
/**
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/ComponentUtils.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/ComponentUtils.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/ComponentUtils.java Wed Mar 9 12:53:22 2016
@@ -1,8 +1,6 @@
package org.hps.analysis.trigger.util;
import java.awt.Component;
-
-import org.hps.analysis.trigger.util.TriggerDiagnosticUtil;
/**
* Class <code>ComponentUtils</code> is a list of utility methods used
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/AbstractConditionsObjectConverter.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/AbstractConditionsObjectConverter.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/AbstractConditionsObjectConverter.java Wed Mar 9 12:53:22 2016
@@ -3,8 +3,6 @@
import java.sql.SQLException;
import java.util.logging.Logger;
-import org.hps.conditions.api.BaseConditionsObjectCollection;
-import org.hps.conditions.api.ConditionsObject;
import org.hps.conditions.api.ConditionsObjectCollection;
import org.hps.conditions.api.ConditionsObjectException;
import org.hps.conditions.api.ConditionsRecord;
Modified: java/trunk/crawler/src/main/java/org/hps/crawler/LcioReconMetadataReader.java
=============================================================================
--- java/trunk/crawler/src/main/java/org/hps/crawler/LcioReconMetadataReader.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/LcioReconMetadataReader.java Wed Mar 9 12:53:22 2016
@@ -4,16 +4,13 @@
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.lcsim.conditions.ConditionsManager;
import org.lcsim.conditions.ConditionsManagerImplementation;
import org.lcsim.conditions.ConditionsReader;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.EventHeader.LCMetaData;
+//import org.lcsim.event.EventHeader.LCMetaData;
import org.lcsim.lcio.LCIOReader;
import org.lcsim.util.loop.DummyConditionsConverter;
import org.lcsim.util.loop.DummyDetector;
Modified: java/trunk/crawler/src/main/java/org/hps/crawler/RootDstMetadataReader.java
=============================================================================
--- java/trunk/crawler/src/main/java/org/hps/crawler/RootDstMetadataReader.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/RootDstMetadataReader.java Wed Mar 9 12:53:22 2016
@@ -1,10 +1,10 @@
package org.hps.crawler;
-import hep.io.root.RootClassNotFound;
-import hep.io.root.RootFileReader;
-import hep.io.root.interfaces.TLeafElement;
-import hep.io.root.interfaces.TObjArray;
-import hep.io.root.interfaces.TTree;
+//import hep.io.root.RootClassNotFound;
+//import hep.io.root.RootFileReader;
+//import hep.io.root.interfaces.TLeafElement;
+//import hep.io.root.interfaces.TObjArray;
+//import hep.io.root.interfaces.TTree;
import java.io.File;
import java.io.IOException;
Modified: java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java (original)
+++ java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java Wed Mar 9 12:53:22 2016
@@ -11,7 +11,6 @@
import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014JavaBuilder;
import org.lcsim.geometry.compact.converter.HPSTrackerBuilder;
import org.lcsim.geometry.compact.converter.HPSTrackerJavaBuilder;
-import org.lcsim.geometry.compact.converter.JavaSurveyVolume;
import org.lcsim.geometry.subdetector.HPSTestRunTracker2014;
/**
Modified: java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014Converter.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014Converter.java (original)
+++ java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014Converter.java Wed Mar 9 12:53:22 2016
@@ -7,7 +7,6 @@
import org.lcsim.geometry.compact.converter.HPSTracker2014JavaBuilder;
import org.lcsim.geometry.compact.converter.HPSTrackerBuilder;
import org.lcsim.geometry.compact.converter.HPSTrackerJavaBuilder;
-import org.lcsim.geometry.compact.converter.JavaSurveyVolume;
import org.lcsim.geometry.subdetector.HPSTracker2014;
Modified: java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTrackerConverter.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTrackerConverter.java (original)
+++ java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTrackerConverter.java Wed Mar 9 12:53:22 2016
@@ -1,8 +1,4 @@
package org.lcsim.detector.converter.compact;
-
-import hep.physics.matrix.BasicMatrix;
-import hep.physics.vec.BasicHep3Vector;
-import hep.physics.vec.VecOp;
import java.util.ArrayList;
import java.util.HashMap;
@@ -16,15 +12,11 @@
import org.lcsim.detector.DetectorIdentifierHelper;
import org.lcsim.detector.DetectorIdentifierHelper.SystemMap;
import org.lcsim.detector.IDetectorElement;
-
import org.lcsim.detector.IPhysicalVolume;
import org.lcsim.detector.IPhysicalVolumePath;
-import org.lcsim.detector.IRotation3D;
-import org.lcsim.detector.ITranslation3D;
import org.lcsim.detector.LogicalVolume;
import org.lcsim.detector.PhysicalVolume;
import org.lcsim.detector.RotationGeant;
-import org.lcsim.detector.RotationPassiveXYZ;
import org.lcsim.detector.Transform3D;
import org.lcsim.detector.Translation3D;
import org.lcsim.detector.identifier.ExpandedIdentifier;
@@ -35,10 +27,7 @@
import org.lcsim.detector.material.IMaterial;
import org.lcsim.detector.material.MaterialStore;
import org.lcsim.detector.solids.Box;
-import org.lcsim.detector.solids.Polygon3D;
-import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.SiSensor;
-import org.lcsim.detector.tracker.silicon.SiStrips;
import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;
import org.lcsim.detector.tracker.silicon.SiTrackerModule;
import org.lcsim.geometry.compact.Detector;
Modified: java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java (original)
+++ java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java Wed Mar 9 12:53:22 2016
@@ -16,7 +16,6 @@
import org.lcsim.detector.RotationGeant;
import org.lcsim.detector.Transform3D;
import org.lcsim.detector.Translation3D;
-import org.lcsim.detector.material.IMaterial;
import org.lcsim.detector.material.MaterialStore;
import org.lcsim.detector.solids.Box;
import org.lcsim.geometry.util.TransformationUtils;
Modified: java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java (original)
+++ java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java Wed Mar 9 12:53:22 2016
@@ -9,7 +9,6 @@
import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition;
import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014LCDDBuilder;
import org.lcsim.geometry.compact.converter.HPSTrackerBuilder;
-import org.lcsim.geometry.compact.converter.HPSTrackerGeometryDefinition;
import org.lcsim.geometry.compact.converter.HPSTrackerLCDDBuilder;
import org.lcsim.geometry.compact.converter.lcdd.util.Box;
import org.lcsim.geometry.compact.converter.lcdd.util.LCDD;
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java Wed Mar 9 12:53:22 2016
@@ -6,7 +6,6 @@
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawCalorimeterHit;
-import org.lcsim.event.base.BaseCalorimeterHit;
import org.lcsim.geometry.Detector;
import org.lcsim.lcio.LCIOConstants;
import org.lcsim.util.Driver;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/scalers/DeadtimePlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/scalers/DeadtimePlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/scalers/DeadtimePlots.java Wed Mar 9 12:53:22 2016
@@ -9,9 +9,7 @@
import org.hps.record.scalers.ScalerUtilities;
import org.hps.record.scalers.ScalerUtilities.LiveTimeIndex;
import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.Axis;
import org.jfree.chart.axis.DateAxis;
-import org.jfree.chart.axis.ValueAxis;
import org.jfree.data.time.Second;
import org.jfree.data.time.TimeSeriesCollection;
import org.lcsim.event.EventHeader;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java Wed Mar 9 12:53:22 2016
@@ -1,13 +1,9 @@
package org.hps.monitoring.drivers.svt;
-import org.hps.monitoring.drivers.trackrecon.TrackingReconPlots;
import hep.aida.IAnalysisFactory;
-import hep.aida.IHistogram1D;
-import hep.aida.IHistogram2D;
import hep.aida.IPlotter;
import hep.aida.IPlotterStyle;
import hep.aida.IProfile1D;
-import hep.aida.ref.plotter.PlotterRegion;
import java.io.IOException;
import java.util.HashMap;
@@ -16,14 +12,14 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-
+import org.hps.monitoring.drivers.trackrecon.TrackingReconPlots;
//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.FittedRawTrackerHit;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.tracker.silicon.DopedSilicon;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiSensor;
-import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java Wed Mar 9 12:53:22 2016
@@ -1,9 +1,4 @@
package org.hps.monitoring.drivers.svt;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import hep.aida.IAnalysisFactory;
import hep.aida.IHistogram1D;
@@ -18,17 +13,22 @@
import hep.aida.ref.rootwriter.RootFileStore;
import hep.physics.vec.Hep3Vector;
-import java.util.HashSet;
-import java.util.Set;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import org.hps.monitoring.subsys.StatusCode;
import org.hps.monitoring.subsys.Subsystem;
import org.hps.monitoring.subsys.SystemStatus;
import org.hps.monitoring.subsys.SystemStatusImpl;
+import org.hps.recon.tracking.SvtPlotUtils;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TIData;
+import org.lcsim.detector.ITransform3D;
+import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
-import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.SiStrips;
-import org.lcsim.detector.ITransform3D;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
import org.lcsim.event.RawTrackerHit;
@@ -36,9 +36,6 @@
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.digitization.sisim.TrackerHitType;
import org.lcsim.util.Driver;
-import org.hps.recon.tracking.SvtPlotUtils;
-import org.hps.record.triggerbank.AbstractIntData;
-import org.hps.record.triggerbank.TIData;
import org.lcsim.util.aida.AIDA;
/**
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java Wed Mar 9 12:53:22 2016
@@ -1,9 +1,4 @@
package org.hps.monitoring.drivers.svt;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
import hep.aida.IAnalysisFactory;
import hep.aida.IHistogram1D;
@@ -17,18 +12,19 @@
import hep.aida.jfree.plotter.PlotterRegion;
import hep.aida.ref.rootwriter.RootFileStore;
-import java.util.HashSet;
-import java.util.Set;
-
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.hps.recon.tracking.SvtPlotUtils;
+import org.lcsim.detector.tracker.silicon.DopedSilicon;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.util.Driver;
-import org.hps.recon.tracking.FittedRawTrackerHit;
-import org.hps.recon.tracking.SvtPlotUtils;
-import org.lcsim.detector.tracker.silicon.DopedSilicon;
import org.lcsim.util.aida.AIDA;
/**
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java Wed Mar 9 12:53:22 2016
@@ -1,35 +1,31 @@
package org.hps.monitoring.drivers.svt;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import hep.aida.IAnalysisFactory;
-import hep.aida.IHistogramFactory;
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
+import hep.aida.IHistogramFactory;
import hep.aida.IPlotter;
import hep.aida.IPlotterFactory;
import hep.aida.IPlotterStyle;
import hep.aida.ITree;
import hep.aida.ref.rootwriter.RootFileStore;
-import org.lcsim.util.Driver;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.hps.recon.tracking.FittedRawTrackerHit;
+import org.hps.recon.tracking.ShapeFitParameters;
+import org.hps.record.triggerbank.SSPCluster;
+import org.hps.record.triggerbank.SSPData;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.GenericObject;
import org.lcsim.event.LCRelation;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
-import org.hps.recon.tracking.FittedRawTrackerHit;
-import org.hps.recon.tracking.ShapeFitParameters;
-import org.hps.record.triggerbank.AbstractIntData;
-import org.hps.record.triggerbank.SSPCluster;
-import org.hps.record.triggerbank.SSPData;
-import org.hps.record.triggerbank.SSPSinglesTrigger;
-import org.hps.record.triggerbank.TIData;
+import org.lcsim.util.Driver;
/**
* Monitoring driver that will be used when 'timing in' the SVT.
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/SVTOpeningAlignment.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/SVTOpeningAlignment.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/SVTOpeningAlignment.java Wed Mar 9 12:53:22 2016
@@ -1,8 +1,8 @@
package org.hps.monitoring.drivers.trackrecon;
+import static org.hps.monitoring.drivers.trackrecon.PlotAndFitUtilities.fitAndPutParameters;
import hep.aida.IAnalysisFactory;
import hep.aida.IFitFactory;
-import hep.aida.IFitResult;
import hep.aida.IFitter;
import hep.aida.IFunction;
import hep.aida.IFunctionFactory;
@@ -10,12 +10,13 @@
import hep.aida.IPlotter;
import hep.aida.IPlotterFactory;
import hep.aida.IPlotterStyle;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import static org.hps.monitoring.drivers.trackrecon.PlotAndFitUtilities.fitAndPutParameters;
+
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.event.TrackState;
@@ -24,7 +25,6 @@
import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import static org.hps.monitoring.drivers.trackrecon.PlotAndFitUtilities.performGaussianFit;
/**
*
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackResiduals.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackResiduals.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackResiduals.java Wed Mar 9 12:53:22 2016
@@ -1,20 +1,20 @@
package org.hps.monitoring.drivers.trackrecon;
+import static org.hps.monitoring.drivers.trackrecon.PlotAndFitUtilities.fitAndPutParameters;
+import static org.hps.monitoring.drivers.trackrecon.PlotAndFitUtilities.plot;
import hep.aida.IAnalysisFactory;
import hep.aida.IFitFactory;
-import hep.aida.IFitResult;
-import hep.aida.IFitter;
import hep.aida.IFunction;
import hep.aida.IFunctionFactory;
import hep.aida.IHistogram1D;
import hep.aida.IPlotter;
import hep.aida.IPlotterFactory;
+
import java.io.IOException;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import static org.hps.monitoring.drivers.trackrecon.PlotAndFitUtilities.fitAndPutParameters;
-import static org.hps.monitoring.drivers.trackrecon.PlotAndFitUtilities.plot;
+
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
import org.lcsim.geometry.Detector;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/V0ReconPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/V0ReconPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/V0ReconPlots.java Wed Mar 9 12:53:22 2016
@@ -1,5 +1,6 @@
package org.hps.monitoring.drivers.trackrecon;
+import static org.hps.monitoring.drivers.trackrecon.PlotAndFitUtilities.plot;
import hep.aida.IAnalysisFactory;
import hep.aida.IFitFactory;
import hep.aida.IFunctionFactory;
@@ -7,12 +8,12 @@
import hep.aida.IHistogram2D;
import hep.aida.IPlotter;
import hep.aida.IPlotterFactory;
-import hep.aida.IPlotterStyle;
+
import java.io.IOException;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import static org.hps.monitoring.drivers.trackrecon.PlotAndFitUtilities.plot;
+
import org.lcsim.event.EventHeader;
import org.lcsim.event.ReconstructedParticle;
import org.lcsim.event.Track;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java Wed Mar 9 12:53:22 2016
@@ -11,16 +11,11 @@
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.detector.ecal.EcalCrystal;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.compact.Subdetector;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-
-/*Conditions system imports*/
/**
* The driver <code>EcalDaqPlots</code> implements the histogram shown to the user in the fourth tab of the Monitoring Application, when using the Ecal monitoring lcsim file. It contains only a
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java Wed Mar 9 12:53:22 2016
@@ -13,7 +13,6 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.lang.IllegalArgumentException;
import javax.swing.SwingUtilities;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java Wed Mar 9 12:53:22 2016
@@ -13,14 +13,12 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.lang.IllegalArgumentException;
import org.hps.monitoring.ecal.eventdisplay.ui.PDataEventViewer;
import org.hps.monitoring.ecal.eventdisplay.ui.PEventViewer;
import org.hps.monitoring.ecal.eventdisplay.ui.Viewer;
import org.hps.monitoring.ecal.eventdisplay.util.CrystalEvent;
import org.hps.monitoring.ecal.eventdisplay.util.CrystalListener;
-import org.hps.monitoring.ecal.plots.EcalMonitoringUtilities;
import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.RawTrackerHit;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java Wed Mar 9 12:53:22 2016
@@ -21,7 +21,6 @@
import java.io.PrintWriter;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Modified: java/trunk/recon/src/main/java/org/hps/recon/filtering/PulserScalerAndEpicsFilter.java
=============================================================================
--- java/trunk/recon/src/main/java/org/hps/recon/filtering/PulserScalerAndEpicsFilter.java (original)
+++ java/trunk/recon/src/main/java/org/hps/recon/filtering/PulserScalerAndEpicsFilter.java Wed Mar 9 12:53:22 2016
@@ -7,21 +7,17 @@
import java.io.File;
import java.io.IOException;
-import org.lcsim.event.Cluster;
+import org.hps.conditions.ConditionsDriver;
+import org.hps.record.epics.EpicsData;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TIData;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
import org.lcsim.lcio.LCIOReader;
import org.lcsim.lcio.LCIOWriter;
import org.lcsim.util.Driver;
-import org.hps.conditions.ConditionsDriver;
-import org.hps.recon.ecal.cluster.ClusterUtilities;
//import org.hps.recon.ecal.triggerbank.AbstractIntData;
//import org.hps.recon.ecal.triggerbank.TIData;
-
-import org.hps.record.triggerbank.AbstractIntData;
-import org.hps.record.triggerbank.TIData;
-import org.hps.record.epics.EpicsData;
-import org.hps.record.scalers.ScalerData;
public class PulserScalerAndEpicsFilter extends Driver{
Modified: java/trunk/recon/src/main/java/org/hps/recon/filtering/SvtRawHitMultiplicityFilter.java
=============================================================================
--- java/trunk/recon/src/main/java/org/hps/recon/filtering/SvtRawHitMultiplicityFilter.java (original)
+++ java/trunk/recon/src/main/java/org/hps/recon/filtering/SvtRawHitMultiplicityFilter.java Wed Mar 9 12:53:22 2016
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.hps.recon.filtering;
import java.util.ArrayList;
@@ -15,7 +12,6 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.compact.converter.HPSTrackerBuilder;
-import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
/**
*
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackDataDriver.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackDataDriver.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackDataDriver.java Wed Mar 9 12:53:22 2016
@@ -8,7 +8,6 @@
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.GenericObject;
import org.lcsim.event.LCRelation;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.RelationalTable;
@@ -180,9 +179,7 @@
// Loop over each of the track collections retrieved from the event
for (List<Track> tracks : trackCollections) {
-
-
-
+
// Loop over all the tracks in the event
for (Track track : tracks) {
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java Wed Mar 9 12:53:22 2016
@@ -4,7 +4,6 @@
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Matrix;
import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.SpacePoint;
import hep.physics.vec.VecOp;
import java.util.ArrayList;
@@ -65,7 +64,6 @@
* @author Omar Moreno <[log in to unmask]>
*/
// TODO: Switch to tracking/LCsim coordinates for the extrapolation output!
-// FIXME: This class should probably be broken up into several different sets of utilities by type. --JM
public class TrackUtils {
/**
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLFileIO.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLFileIO.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLFileIO.java Wed Mar 9 12:53:22 2016
@@ -11,8 +11,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.recon.tracking.gbl.GblUtils.ClParams;
-import org.hps.recon.tracking.gbl.GblUtils.PerigeeParams;
import org.hps.svt.alignment.RunAlignment;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java Wed Mar 9 12:53:22 2016
@@ -40,8 +40,6 @@
import org.lcsim.geometry.subdetector.BarrelEndcapFlag;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.digitization.sisim.TrackerHitType;
-import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
-import org.lcsim.recon.tracking.seedtracker.SeedTrack;
/**
* Calculate the input needed for Millepede minimization.
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLTrackData.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLTrackData.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLTrackData.java Wed Mar 9 12:53:22 2016
@@ -3,7 +3,6 @@
import hep.physics.vec.BasicHep3Matrix;
import hep.physics.vec.Hep3Matrix;
-import org.hps.recon.tracking.gbl.GblUtils.PerigeeParams;
import org.lcsim.event.GenericObject;
/**
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/matrix/Matrix.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/matrix/Matrix.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/matrix/Matrix.java Wed Mar 9 12:53:22 2016
@@ -1,8 +1,6 @@
package org.hps.recon.tracking.gbl.matrix;
-import java.io.BufferedReader;
import java.io.PrintWriter;
-import java.io.StreamTokenizer;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/matrix/Vector.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/matrix/Vector.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/matrix/Vector.java Wed Mar 9 12:53:22 2016
@@ -1,6 +1,5 @@
package org.hps.recon.tracking.gbl.matrix;
-import java.io.PrintWriter;
/**
* Specializes the Matrix class to a vector.
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/STUtils.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/STUtils.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/STUtils.java Wed Mar 9 12:53:22 2016
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.hps.recon.tracking.straight;
import hep.physics.matrix.BasicMatrix;
@@ -22,8 +19,6 @@
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
-import org.lcsim.fit.helicaltrack.HelicalTrackCross;
-import org.lcsim.fit.helicaltrack.HitUtils;
import org.lcsim.fit.line.SlopeInterceptLineFit;
import org.lcsim.fit.line.SlopeInterceptLineFitter;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
@@ -40,9 +35,7 @@
public final static Logger logger = Logger.getLogger(STUtils.class.getSimpleName());
protected static final double sensorThickness = 0.7e-2*0.5; // radiation length per sensor
protected static final double beamEnergy = 1.05;
-
-
-
+
/**
* Private constructor to avoid instantiation.
*/
@@ -134,12 +127,9 @@
}
s += fit.toString();
return s;
- }
-
- }
-
-
-
+ }
+ }
+
static class STStereoTrack {
protected static enum VIEW { YZ,XZ };
private List<STUtils.StereoPair> hits = new ArrayList<STUtils.StereoPair>();
@@ -277,10 +267,7 @@
public double getMomentum() {
return beamEnergy;
- }
-
-
-
+ }
}
static class StereoPair {
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/StraightThroughAnalysisDriver.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/StraightThroughAnalysisDriver.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/StraightThroughAnalysisDriver.java Wed Mar 9 12:53:22 2016
@@ -29,7 +29,6 @@
import org.hps.recon.tracking.SvtPlotUtils;
import org.hps.recon.tracking.straight.STUtils.STStereoTrack;
-import org.hps.recon.tracking.straight.STUtils.STTrack;
import org.lcsim.detector.converter.compact.subdetector.HpsTracker2;
import org.lcsim.detector.converter.compact.subdetector.SvtStereoLayer;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
Modified: java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java Wed Mar 9 12:53:22 2016
@@ -6,22 +6,14 @@
* created on 1/15/2014
*/
-import hep.physics.vec.BasicHep3Vector;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.VecOp;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -30,24 +22,13 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
-import org.hps.recon.tracking.CoordinateTransformations;
-import org.jdom.Attribute;
import org.jdom.DataConversionException;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
-import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.ITransform3D;
-import org.lcsim.detector.tracker.silicon.ChargeCarrier;
-import org.lcsim.detector.tracker.silicon.SiSensor;
-import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.GeometryReader;
import org.lcsim.geometry.compact.converter.MilleParameter;
-import org.lcsim.util.xml.ElementFactory.ElementCreationException;
public class BuildMillepedeCompact {
Modified: java/trunk/util/src/main/java/org/hps/util/ConvertToStdhep.java
=============================================================================
--- java/trunk/util/src/main/java/org/hps/util/ConvertToStdhep.java (original)
+++ java/trunk/util/src/main/java/org/hps/util/ConvertToStdhep.java Wed Mar 9 12:53:22 2016
@@ -15,7 +15,6 @@
import java.util.ArrayList;
import java.util.List;
-import hep.io.stdhep.StdhepBeginRun;
import hep.io.stdhep.StdhepEndRun;
import hep.io.stdhep.StdhepEvent;
import hep.io.stdhep.StdhepWriter;
Modified: java/trunk/util/src/main/java/org/hps/util/LCIOFilterDriver.java
=============================================================================
--- java/trunk/util/src/main/java/org/hps/util/LCIOFilterDriver.java (original)
+++ java/trunk/util/src/main/java/org/hps/util/LCIOFilterDriver.java Wed Mar 9 12:53:22 2016
@@ -5,7 +5,6 @@
package org.hps.util;
import java.io.IOException;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.Track;
import org.lcsim.util.Driver;
import org.lcsim.lcio.LCIOWriter;
Modified: java/trunk/util/src/main/java/org/hps/util/MergeBunches.java
=============================================================================
--- java/trunk/util/src/main/java/org/hps/util/MergeBunches.java (original)
+++ java/trunk/util/src/main/java/org/hps/util/MergeBunches.java Wed Mar 9 12:53:22 2016
@@ -34,7 +34,6 @@
import org.lcsim.lcio.LCIOUtil;
import org.lcsim.lcio.LCIOWriter;
import org.lcsim.lcio.SIOMCParticle;
-import org.lcsim.util.loop.LCIODriver;
public class MergeBunches extends Driver {
