 |
 |
| Commit in hps-java on MAIN | |||
| scripts/make_ecal.sh | +1 | -1 | 1.3 -> 1.4 |
| src/main/java/org/lcsim/hps/monitoring/svt/SVTSimpleEventDisplay.java | +18 | -6 | 1.4 -> 1.5 |
| /SVTHitReconstructionPlots.java | +10 | -11 | 1.13 -> 1.14 |
| src/main/resources/org/lcsim/hps/steering/ECalCalibration.lcsim | +1 | -1 | 1.2 -> 1.3 |
| src/main/java/org/lcsim/hps/recon/ecal/HPSEcalConditions.java | +3 | -3 | 1.8 -> 1.9 |
| src/main/java/org/lcsim/hps/monitoring/ecal/EcalMonitoringPlots.java | +4 | -12 | 1.8 -> 1.9 |
| src/main/java/org/lcsim/hps/evio/ECalEvioReader.java | +7 | -4 | 1.17 -> 1.18 |
| +44 | -38 | ||
new ECal map and stuff
diff -u -r1.3 -r1.4 --- make_ecal.sh 17 May 2012 18:24:10 -0000 1.3 +++ make_ecal.sh 18 May 2012 07:41:49 -0000 1.4 @@ -1,7 +1,7 @@
#!/bin/bash #prints the ECal physicalID-daqID conversion table, as found in daqmap/ecal.txt in hps-detectors. echo "#x y crate slot channel"
-topslots=( 10 13 9 14 8 15 7 16 6 17 5 18 4 19 )
+topslots=( 10 13 9 14 8 15 7 16 6 17 5 18 4 3 )
botslots=( 10 13 9 14 8 15 7 16 6 17 5 18 4 19 ) x=-23 y=1
diff -u -r1.4 -r1.5 --- SVTSimpleEventDisplay.java 18 May 2012 03:48:45 -0000 1.4 +++ SVTSimpleEventDisplay.java 18 May 2012 07:41:49 -0000 1.5 @@ -11,6 +11,7 @@
import org.lcsim.fit.helicaltrack.HelicalTrackHit; import org.lcsim.geometry.Detector; import org.lcsim.hps.monitoring.AIDAFrame;
+import org.lcsim.hps.monitoring.Resettable;
import org.lcsim.hps.recon.tracking.HPSSVTDAQMaps; import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit; import org.lcsim.util.Driver;
@@ -27,7 +28,7 @@
* jeremy Exp $ * */
-public class SVTSimpleEventDisplay extends Driver {
+public class SVTSimpleEventDisplay extends Driver implements Resettable {
private AIDAFrame plotterFrame;
private String inputCollection = "SVTRawTrackerHits";
@@ -197,9 +198,20 @@
}
}
}
-// public void endOfData() {
-// if (plotter != null) {
-// plotter.hide();
-// }
-// }
+
+ public void endOfData() {
+ plotterFrame.dispose();
+ }
+
+ @Override
+ public void reset() {
+ for (int module = 0; module < 2; module++) {
+ for (int layer = 1; layer < 11; layer++) {
+ rth[module][layer - 1].reset();
+ th[module][layer - 1].reset();
+ hth[module][layer - 1].reset();
+ }
+ hitCount[module].reset();
+ }
+ }
}
\ No newline at end of file
diff -u -r1.13 -r1.14 --- SVTHitReconstructionPlots.java 18 May 2012 03:48:45 -0000 1.13 +++ SVTHitReconstructionPlots.java 18 May 2012 07:41:49 -0000 1.14 @@ -2,7 +2,6 @@
import hep.aida.*; import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap; import java.util.List; import java.util.Map;
@@ -24,6 +23,7 @@
/** * * @author mgraham
+ * @version $Id: SVTHitReconstructionPlots.java,v 1.14 2012/05/18 07:41:49 meeg Exp $
*/
public class SVTHitReconstructionPlots extends Driver implements Resettable {
@@ -129,11 +129,11 @@
int region = sensorRegionMap.get(sensor.getName());
plotter.region(region).plot(timingPlot);
plotter2.region(region).plot(amplitudePlot);
+ plotter3.region(region).plot(chisqPlot);
plotter4.region(region).plot(nrawPlot);
plotter5.region(region).plot(nrecoPlot);
plotter6.region(region).plot(clusterSizePlot);
plotter7.region(region).plot(clusterAmpPlot);
- plotter3.region(region).plot(chisqPlot);
}
plotterFrame.pack();
@@ -182,7 +182,6 @@
return;
}
-
++eventCount;
List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, rawTrackerHitCollectionName);
List<HPSFittedRawTrackerHit> fittedrawHits = event.get(HPSFittedRawTrackerHit.class, fittedTrackerHitCollectionName);
@@ -210,9 +209,7 @@
//double cluAmp = getCluAmp(cluster,fittedrawHits);
double cluAmp = cluster.getdEdx();
aida.histogram1D(sensorName + "_cluster_amp").fill(cluAmp);
-
}
-
}
public double getCluAmp(SiTrackerHitStrip1D stripHits, List<HPSFittedRawTrackerHit> hrths) {
@@ -244,12 +241,14 @@
@Override
public void reset() {
- int ns = sensors.size();
- for (int i = 0; i < ns; i++) {
- aida.histogram1D(sensors.get(i).getName() + "_timing").reset();
- aida.histogram1D(sensors.get(i).getName() + "_amplitude").reset();
- aida.histogram1D(sensors.get(i).getName() + "_raw_hits").reset();
- aida.histogram1D(sensors.get(i).getName() + "_reco_hits").reset();
+ for (SiSensor sensor : sensors) {
+ aida.histogram1D(sensor.getName() + "_timing").reset();
+ aida.histogram1D(sensor.getName() + "_amplitude").reset();
+ aida.histogram1D(sensor.getName() + "_chisq").reset();
+ aida.histogram1D(sensor.getName() + "_raw_hits").reset();
+ aida.histogram1D(sensor.getName() + "_reco_hits").reset();
+ aida.histogram1D(sensor.getName() + "_cluster_size").reset();
+ aida.histogram1D(sensor.getName() + "_cluster_amp").reset();
}
}
diff -u -r1.2 -r1.3 --- ECalCalibration.lcsim 13 May 2012 21:39:24 -0000 1.2 +++ ECalCalibration.lcsim 18 May 2012 07:41:49 -0000 1.3 @@ -10,7 +10,7 @@
<driver name="EventMarkerDriver"/>
<driver name="HPSEcalConditions"/>
<driver name="EcalPedestalPlots"/>
- <driver name="EcalRawConverter"/>
+<!-- <driver name="EcalRawConverter"/>-->
<!--
<driver name="EcalClusterer"/>
<driver name="EcalMonitoringPlots"/>
diff -u -r1.8 -r1.9 --- HPSEcalConditions.java 13 May 2012 21:39:24 -0000 1.8 +++ HPSEcalConditions.java 18 May 2012 07:41:49 -0000 1.9 @@ -17,7 +17,7 @@
/** * * @author meeg
- * @version $Id: HPSEcalConditions.java,v 1.8 2012/05/13 21:39:24 meeg Exp $
+ * @version $Id: HPSEcalConditions.java,v 1.9 2012/05/18 07:41:49 meeg Exp $
*/
public class HPSEcalConditions extends Driver {
@@ -78,9 +78,9 @@
public static void loadPedestals() {
ConditionsManager conditions = ConditionsManager.defaultInstance();
try {
- Reader pedestalsReader = conditions.getRawConditions("calibECal/ecal01.ped").getReader();
+ Reader pedestalsReader = conditions.getRawConditions("calibECal/default01.ped").getReader();
loadPedestals(pedestalsReader, 1);
- pedestalsReader = conditions.getRawConditions("calibECal/ecal02.ped").getReader();
+ pedestalsReader = conditions.getRawConditions("calibECal/default02.ped").getReader();
loadPedestals(pedestalsReader, 2);
} catch (IOException e) {
throw new RuntimeException("couldn't get pedestals file", e);
diff -u -r1.8 -r1.9 --- EcalMonitoringPlots.java 17 May 2012 18:24:11 -0000 1.8 +++ EcalMonitoringPlots.java 18 May 2012 07:41:49 -0000 1.9 @@ -110,18 +110,10 @@
@Override
public void reset() {
- if (hitCountFillPlot != null) {
- hitCountFillPlot.reset();
- }
- if (hitCountDrawPlot != null) {
- hitCountDrawPlot.reset();
- }
- if (clusterCountFillPlot != null) {
- clusterCountFillPlot.reset();
- }
- if (clusterCountDrawPlot != null) {
- clusterCountDrawPlot.reset();
- }
+ hitCountFillPlot.reset(); + hitCountDrawPlot.reset(); + clusterCountFillPlot.reset(); + clusterCountDrawPlot.reset();
}
@Override
diff -u -r1.17 -r1.18 --- ECalEvioReader.java 17 May 2012 14:55:36 -0000 1.17 +++ ECalEvioReader.java 18 May 2012 07:41:49 -0000 1.18 @@ -16,7 +16,7 @@
/** * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: ECalEvioReader.java,v 1.17 2012/05/17 14:55:36 meeg Exp $
+ * @version $Id: ECalEvioReader.java,v 1.18 2012/05/18 07:41:49 meeg Exp $
*/
public class ECalEvioReader extends EvioReader {
// Names of subdetectors.
@@ -129,14 +129,17 @@
System.out.println(" channel=" + channel + "; nSamples=" + nSamples);
}
Long id = HPSEcalConditions.daqToPhysicalID(crate, slot, channel);
- if (id == null) {
- System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
- }
short[] adcValues = new short[nSamples];
for (int i = 0; i < nSamples; i++) {
adcValues[i] = cdata.getShort();
}
+ if (id == null) {
+ if (debug) {
+ System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
+ }
+ continue;
+ }
hits.add(new BaseRawTrackerHit(0, id, adcValues, new ArrayList<SimTrackerHit>(), detector.getSubdetector(ecalName).getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));
}
}
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