Commit in hps-java/src/main/java/org/lcsim/hps on MAIN | |||
evio/SVTHitWriter.java | +3 | -3 | 1.4 -> 1.5 |
recon/tracking/DataTrackerFakeHitDriver.java | +9 | -9 | 1.8 -> 1.9 |
/EventQuality.java | +2 | -2 | 1.1 -> 1.2 |
/HPSSVTCalibrationConstants.java | +1 | -1 | 1.25 -> 1.26 |
/HPSTrack.java | +2 | -2 | 1.7 -> 1.8 |
/SimpleSvtReadout.java | +9 | -9 | 1.16 -> 1.17 |
users/phansson/TestSort.java | +1 | -1 | 1.1 -> 1.2 |
+27 | -27 |
fix usage of diamond operator for 1.6 target compatibility
diff -u -r1.4 -r1.5 --- SVTHitWriter.java 25 Apr 2013 21:33:41 -0000 1.4 +++ SVTHitWriter.java 22 May 2013 18:45:33 -0000 1.5 @@ -24,7 +24,7 @@
/** * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: SVTHitWriter.java,v 1.4 2013/04/25 21:33:41 meeg Exp $
+ * @version $Id: SVTHitWriter.java,v 1.5 2013/05/22 18:45:33 jeremy Exp $
*/ public class SVTHitWriter implements HitWriter {
@@ -52,7 +52,7 @@
for (int i = 0; i < HPSSVTConstants.TOTAL_HYBRIDS_PER_FPGA * HPSSVTConstants.TOTAL_TEMPS_PER_HYBRID; i++) { temps[i] = 23.0; }
- Map<Integer, FpgaData> fpgaData = new HashMap<>();
+ Map<Integer, FpgaData> fpgaData = new HashMap<Integer, FpgaData>();
for (Integer fpgaNumber : SvtUtils.getInstance().getFpgaNumbers()) { fpgaData.put(fpgaNumber, new FpgaData(fpgaNumber, temps, 0)); }
@@ -69,7 +69,7 @@
System.out.println("Writing " + hits.size() + " SVT hits"); System.out.println("Writing " + fpgaData.size() + " FPGA data");
- Map<Integer, List<int[]>> fpgaHits = new HashMap<>();
+ Map<Integer, List<int[]>> fpgaHits = new HashMap<Integer, List<int[]>>();
for (Integer fpgaNumber : SvtUtils.getInstance().getFpgaNumbers()) { fpgaHits.put(fpgaNumber, new ArrayList<int[]>());
diff -u -r1.8 -r1.9 --- DataTrackerFakeHitDriver.java 25 Apr 2013 22:11:14 -0000 1.8 +++ DataTrackerFakeHitDriver.java 22 May 2013 18:45:33 -0000 1.9 @@ -65,14 +65,14 @@
// Subdetector name. private String subdetectorName = "Tracker"; // Various data lists required by digitization.
- private List<String> processPaths = new ArrayList<>(); - private List<IDetectorElement> processDEs = new ArrayList<>(); - private Set<SiSensor> processSensors = new HashSet<>();
+ private List<String> processPaths = new ArrayList<String>(); + private List<IDetectorElement> processDEs = new ArrayList<IDetectorElement>(); + private Set<SiSensor> processSensors = new HashSet<SiSensor>();
//Visualization private boolean hideFrame = false; private AIDA aida = AIDA.defaultInstance(); private HashMap<SiSensor, IProfile1D> _delta_histos;
- private HashMap<SiSensor, IHistogram1D> _delta_itercount = new HashMap<>();
+ private HashMap<SiSensor, IHistogram1D> _delta_itercount = new HashMap<SiSensor, IHistogram1D>();
IProfile1D _prf_final_deltas; IProfile1D _prf_all_deltas; IHistogram1D _h_nstriphits_top;
@@ -128,7 +128,7 @@
* Creates a new instance of TrackerHitDriver. */ public DataTrackerFakeHitDriver() {
- this._delta_histos = new HashMap<>();
+ this._delta_histos = new HashMap<SiSensor, IProfile1D>();
} /**
@@ -191,15 +191,15 @@
// Instantiate the list of interest if (this._doHth) { this.printDebug("Creating HelicalTrackHits...");
- hths = new ArrayList<>();
+ hths = new ArrayList<HelicalTrackHit>();
} else if (createSimTrackerHits) { this.printDebug("Creating SimTrackerHits...");
- simHits = new ArrayList<>();
+ simHits = new ArrayList<SimTrackerHit>();
metaData = event.getMetaData(event.get(SimTrackerHit.class, "TrackerHits")); } else { // Create StripHit1Ds by default this.printDebug("Creating StripHit1D...");
- stripHits1D = new ArrayList<>();
+ stripHits1D = new ArrayList<SiTrackerHit>();
} if (debug) {
@@ -885,7 +885,7 @@
public List<RawTrackerHit> makeRawTrackerFakeHit(SiSensor sensor) { //if(debug) System.out.println(this.getClass().getSimpleName() + ": makeRawTrackerFakeHit for sensor " + sensor.getName());
- List<RawTrackerHit> raw_hits = new ArrayList<>();
+ List<RawTrackerHit> raw_hits = new ArrayList<RawTrackerHit>();
// Get SimTrackerHits //IReadout ro = sensor.getReadout();
diff -u -r1.1 -r1.2 --- EventQuality.java 20 Apr 2013 03:58:44 -0000 1.1 +++ EventQuality.java 22 May 2013 18:45:33 -0000 1.2 @@ -30,7 +30,7 @@
return this.value; } }
- private List<CutObject> _cut_list = new ArrayList<>();
+ private List<CutObject> _cut_list = new ArrayList<CutObject>();
public EventQuality() { addCut(new CutObject(Cut.CHI2,"CHI2",10.,10.,10.));
@@ -90,7 +90,7 @@
private class CutObject { String _name = "UNDEFINED"; Cut _cut = Cut.UNDEFINED;
- Map<Quality,Double> _map = new HashMap<>();
+ Map<Quality,Double> _map = new HashMap<Quality,Double>();
public CutObject(Cut c, String name, double val1,double val2,double val3) { _cut = c; _name = name;
diff -u -r1.25 -r1.26 --- HPSSVTCalibrationConstants.java 18 Apr 2013 18:01:55 -0000 1.25 +++ HPSSVTCalibrationConstants.java 22 May 2013 18:45:33 -0000 1.26 @@ -63,7 +63,7 @@
*/>, List<Double> /* * channels */> offsetMap = new HashMap<Pair<Integer, Integer>, List<Double>>();
- private static Map<Pair<Integer, Integer>, Double> t0ShiftMap = new HashMap<>();
+ private static Map<Pair<Integer, Integer>, Double> t0ShiftMap = new HashMap<Pair<Integer, Integer>, Double>();
private static boolean pedestalLoaded = false; private static boolean tpLoaded = false; private static int totalBadChannels = 0;
diff -u -r1.7 -r1.8 --- HPSTrack.java 25 Apr 2013 23:29:55 -0000 1.7 +++ HPSTrack.java 22 May 2013 18:45:33 -0000 1.8 @@ -99,7 +99,7 @@
* Get map of the the track trajectory within the uniform bfield */ public Map<Integer, Double[]> trackTrajectory(double zStart, double zStop, int nSteps) {
- Map<Integer, Double[]> traj = new HashMap<>();
+ Map<Integer, Double[]> traj = new HashMap<Integer, Double[]>();
double step = (zStop - zStart) / nSteps; Double zVal = zStart; Integer nstep = 0;
@@ -120,7 +120,7 @@
* Get map of the the track direction within the uniform bfield */ public Map<Integer, Double[]> trackDirection(double zStart, double zStop, int nSteps) {
- Map<Integer, Double[]> traj = new HashMap<>();
+ Map<Integer, Double[]> traj = new HashMap<Integer, Double[]>();
double step = (zStop - zStart) / nSteps; Double zVal = zStart;
diff -u -r1.16 -r1.17 --- SimpleSvtReadout.java 25 Apr 2013 22:11:14 -0000 1.16 +++ SimpleSvtReadout.java 22 May 2013 18:45:33 -0000 1.17 @@ -31,7 +31,7 @@
/** * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: SimpleSvtReadout.java,v 1.16 2013/04/25 22:11:14 meeg Exp $
+ * @version $Id: SimpleSvtReadout.java,v 1.17 2013/05/22 18:45:33 jeremy Exp $
*/ public class SimpleSvtReadout extends TriggerableDriver {
@@ -39,7 +39,7 @@
private SiSensorSim siSimulation = new CDFSiSensorSim(); private String outputCollection = "SVTRawTrackerHits"; private String relationCollection = "SVTTrueHitRelations";
- private Map<SiSensor, PriorityQueue<StripHit>[]> hitMap = new HashMap<>();
+ private Map<SiSensor, PriorityQueue<StripHit>[]> hitMap = new HashMap<SiSensor, PriorityQueue<StripHit>[]>();
//readout period time offset in ns private double readoutOffset = 0.0; private double readoutLatency = 240.0;
@@ -122,7 +122,7 @@
PriorityQueue<StripHit>[] hitQueues = hitMap.get(sensor); if (hitQueues[channel] == null) {
- hitQueues[channel] = new PriorityQueue<>();
+ hitQueues[channel] = new PriorityQueue<StripHit>();
} hitQueues[channel].add(stripHit); }
@@ -144,7 +144,7 @@
checkTrigger(event); } else { // Create a list to hold the analog data
- List<RawTrackerHit> hits = new ArrayList<>();
+ List<RawTrackerHit> hits = new ArrayList<RawTrackerHit>();
for (StripHit stripHit : stripHits) { SiSensor sensor = stripHit.sensor;
@@ -168,7 +168,7 @@
long cell_id = SvtUtils.makeCellID(sensor, channel);
- RawTrackerHit hit = new BaseRawTrackerHit(0, cell_id, samples, new ArrayList<>(stripHit.simHits), sensor);
+ RawTrackerHit hit = new BaseRawTrackerHit(0, cell_id, samples, new ArrayList<SimTrackerHit>(stripHit.simHits), sensor);
// System.out.println("Making RTH"); if (readoutCuts(hit)) { // System.out.println("RTH passed cuts");
@@ -184,7 +184,7 @@
} private List<StripHit> doSiSimulation() {
- List<StripHit> stripHits = new ArrayList<>();
+ List<StripHit> stripHits = new ArrayList<StripHit>();
for (SiSensor sensor : SvtUtils.getInstance().getSensors()) { // Set the sensor to be used in the charge deposition simulation
@@ -297,8 +297,8 @@
// System.out.println("Got trigger"); // Create a list to hold the analog data
- List<RawTrackerHit> hits = new ArrayList<>(); - List<LCRelation> trueHitRelations = new ArrayList<>();
+ List<RawTrackerHit> hits = new ArrayList<RawTrackerHit>(); + List<LCRelation> trueHitRelations = new ArrayList<LCRelation>();
// Calculate time of first sample double firstSample = Math.floor((ClockSingleton.getTime() - readoutLatency - readoutOffset) / HPSSVTConstants.SAMPLING_INTERVAL) * HPSSVTConstants.SAMPLING_INTERVAL + readoutOffset;
@@ -316,7 +316,7 @@
addNoise(sensor, channel, signal); }
- List<SimTrackerHit> simHits = new ArrayList<>();
+ List<SimTrackerHit> simHits = new ArrayList<SimTrackerHit>();
if (hitQueues[channel] != null) { for (StripHit hit : hitQueues[channel]) {
diff -u -r1.1 -r1.2 --- TestSort.java 20 Apr 2013 01:05:08 -0000 1.1 +++ TestSort.java 22 May 2013 18:45:34 -0000 1.2 @@ -39,7 +39,7 @@
*/ public static void main(String[] args) {
- List<CmpClass> list = new ArrayList<>();
+ List<CmpClass> list = new ArrayList<CmpClass>();
list.add(new CmpClass(1)); list.add(new CmpClass(2)); list.add(new CmpClass(3));
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1