Author: [log in to unmask]
Date: Tue Feb 23 10:43:11 2016
New Revision: 4241
Log:
Merge trunk changes to dev branch.
Added:
java/branches/jeremy-dev/steering-files/src/main/resources/org/hps/steering/users/celentan/LedOnlineOfflineComparison.lcsim
- copied unchanged from r4240, java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/LedOnlineOfflineComparison.lcsim
java/branches/jeremy-dev/steering-files/src/main/resources/org/hps/steering/users/holly/EngRun2015FullReconMC_FEE.lcsim
- copied unchanged from r4240, java/trunk/steering-files/src/main/resources/org/hps/steering/users/holly/EngRun2015FullReconMC_FEE.lcsim
Modified:
java/branches/jeremy-dev/ (props changed)
java/branches/jeremy-dev/analysis/src/main/java/org/hps/analysis/ecal/FEEClusterPlotter.java
java/branches/jeremy-dev/conditions/ (props changed)
java/branches/jeremy-dev/distribution/ (props changed)
java/branches/jeremy-dev/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterer.java
java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java
java/branches/jeremy-dev/monitoring-app/ (props changed)
java/branches/jeremy-dev/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java
java/branches/jeremy-dev/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceStandalone.lcsim
Modified: java/branches/jeremy-dev/analysis/src/main/java/org/hps/analysis/ecal/FEEClusterPlotter.java
=============================================================================
--- java/branches/jeremy-dev/analysis/src/main/java/org/hps/analysis/ecal/FEEClusterPlotter.java (original)
+++ java/branches/jeremy-dev/analysis/src/main/java/org/hps/analysis/ecal/FEEClusterPlotter.java Tue Feb 23 10:43:11 2016
@@ -53,7 +53,7 @@
aida.tree().cd("/");
for (EcalChannel cc : ecalConditions.getChannelCollection()) {
//aida.histogram1D(getHistoName(cc),200,0.5,1.3);
- aida.histogram1D(getHistoName(cc),200,0.6,2.8);
+ aida.histogram1D(getHistoName(cc),200,0.9,2.8);
}
}
@@ -91,7 +91,7 @@
double time = seed.getTime();
//if ((seedE/clusE > 0.6) && seedE >0.45 && time>30 && time <70){
- if ((seedE/clusE > 0.6) && seedE >0.6 && time>30 && time <70){
+ if ((seedE/clusE > 0.6) && seedE >0.65 && time>30 && time <70){
EcalChannel cc = findChannel(seed);
aida.histogram1D(getHistoName(cc)).fill(clusE);
Modified: java/branches/jeremy-dev/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterer.java
=============================================================================
--- java/branches/jeremy-dev/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterer.java (original)
+++ java/branches/jeremy-dev/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterer.java Tue Feb 23 10:43:11 2016
@@ -102,7 +102,7 @@
// Diagnostic plots.
private AIDA aida = AIDA.defaultInstance();
- private IHistogram1D hitEnergy = aida.histogram1D("GTP(O) Cluster Plot/Hit Energy Distribution", 256, -1.0, 2.2);
+ private IHistogram1D hitEnergy = aida.histogram1D("GTP(O) Cluster Plots/Hit Energy Distribution", 256, -1.0, 2.2);
private IHistogram1D clusterSeedEnergy = aida.histogram1D("GTP(O) Cluster Plots/Cluster Seed Energy Distribution", 176, 0.0, 2.2);
private IHistogram1D clusterHitCount = aida.histogram1D("GTP(O) Cluster Plots/Cluster Hit Count Distribution", 9, 1, 10);
private IHistogram1D clusterTotalEnergy = aida.histogram1D("GTP(O) Cluster Plots/Cluster Total Energy Distribution", 176, 0.0, 2.2);
@@ -561,4 +561,4 @@
// treated as within time.
else { return false; }
}
-}
+}
Modified: java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java
=============================================================================
--- java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java (original)
+++ java/branches/jeremy-dev/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java Tue Feb 23 10:43:11 2016
@@ -232,11 +232,7 @@
SvtHeaderDataInfo headerData = this.extractSvtHeader(dataBank.getHeader().getNumber(), data);
// Check that the multisample count is consistent
- try {
- this.checkSvtSampleCount(sampleCount, headerData);
- } catch(final SvtEvioHeaderException e) {
- LOGGER.warning("Caught SVT exception:" + e.getMessage());
- }
+ this.checkSvtSampleCount(sampleCount, headerData);
// Add header to list
headers.add(headerData);
Modified: java/branches/jeremy-dev/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java
=============================================================================
--- java/branches/jeremy-dev/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java (original)
+++ java/branches/jeremy-dev/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java Tue Feb 23 10:43:11 2016
@@ -44,9 +44,10 @@
// ClusterUtilities.findSeedHit(cc).getRawEnergy() < 0.4)
// cc.Delete();
- // keep events with a cluster over 600 MeV with seed over 400 MeV:
- if (cc.getEnergy() > 0.6 &&
- ClusterUtilities.findSeedHit(cc).getCorrectedEnergy() > 0.4)
+ // keep events with a cluster over 600 MeV with seed over 400 MeV (for 2015 running).
+ // keep events with cluster over 1.2 GeV and seed over 650 MeV for 2016 running.
+ if (cc.getEnergy() > 1.2 &&
+ ClusterUtilities.findSeedHit(cc).getCorrectedEnergy() > 0.65)
return;
}
Modified: java/branches/jeremy-dev/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceStandalone.lcsim
=============================================================================
--- java/branches/jeremy-dev/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceStandalone.lcsim (original)
+++ java/branches/jeremy-dev/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceStandalone.lcsim Tue Feb 23 10:43:11 2016
@@ -5,8 +5,7 @@
<driver name="EcalRunningPedestal"/>
<driver name="EcalRawConverter" />
<driver name="LedAnalysisDriver"/>
- <!-- <driver name="EcalEventDisplay" /> --> <!-- Ecal event display -->
- <driver name="AidaSaveDriver"/>
+ <driver name="AidaSaveDriver"/>
</execute>
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
@@ -18,34 +17,27 @@
</driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
- <use2014Gain>false</use2014Gain>
<useTimestamps>false</useTimestamps>
<useTruthTime>false</useTruthTime>
<useRunningPedestal>true</useRunningPedestal>
<useTimeWalkCorrection>true</useTimeWalkCorrection>
+ <nsa>60</nsa> <!-- these are critical since the defaults in software are 100 - 20, as in prod. runs -->
+ <nsb>16</nsb>
</driver>
- <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
- <inputCollection>EcalCalHits</inputCollection>
- <inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>
- <inputClusterCollection>EcalClusters</inputClusterCollection>
- <pedSamples>20</pedSamples>
- <maxEch>15.0</maxEch>
- <minEch>0.005</minEch>
- <eventRefreshRate>2</eventRefreshRate>
- </driver>
<driver name="LedAnalysisDriver" type="org.hps.monitoring.ecal.plots.EcalLedSequenceMonitor">
<isMonitoringApp>false</isMonitoringApp>
<doFullAnalysis>false</doFullAnalysis>
- <skipMin>0.25</skipMin>
+ <skipMin>0.2</skipMin>
<skipInitial>0.05</skipInitial>
<useRawEnergy>true</useRawEnergy>
- <energyCut>1</energyCut>
+ <energyCut>2.0</energyCut>
<nEventsMin>300</nEventsMin>
<evnMinDraw>0.</evnMinDraw>
- <evnMaxDraw>20000.</evnMaxDraw>
+ <evnMaxDraw>80000.</evnMaxDraw>
+ <saveTuple>false</saveTuple>
</driver>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>${outputFile}</outputFileName>
- </driver>
+ <outputFileName>${outputFile}.LedAnalysis.aida</outputFileName>
+ </driver>
</drivers>
</lcsim>
