Author: [log in to unmask]
Date: Sun Jul 17 10:52:47 2016
New Revision: 4430
Log:
check in everything, brase for impact
Modified:
java/branches/layer0-branch/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/AbstractSvtDetectorSetup.java
java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/EngRun2015SvtDetectorSetup.java
java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/Prop2016SvtDetectorSetup.java
java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/TestRunSvtDetectorSetup.java
java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014ConverterBase.java
java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/subdetector/HpsTracker2.java
java/branches/layer0-branch/job/src/main/java/org/hps/job/JobManager.java
java/branches/layer0-branch/logging/src/main/resources/org/hps/logging/config/logging.properties
java/branches/layer0-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim
Modified: java/branches/layer0-branch/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
=============================================================================
--- java/branches/layer0-branch/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java (original)
+++ java/branches/layer0-branch/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Sun Jul 17 10:52:47 2016
@@ -103,9 +103,14 @@
/**
* The max value for a run to be considered Eng Run 2015.
*/
- private static final int ENG_RUN_2015_MAX_RUN = 9999;
+ private static final int ENG_RUN_2015_MAX_RUN = 6999;
+ /**
+ * The max value for a run to be considered Eng Run 2015.
+ */
+ private static final int PHYS_RUN_2016_MAX_RUN = 9999;
+
static {
// Set default login timeout of 5 seconds.
DriverManager.setLoginTimeout(30);
@@ -162,8 +167,19 @@
* @return <code>true</code> if run number is from the Prop 2016
*/
public static boolean isProp2016Run(final int runNumber) {
- return runNumber > ENG_RUN_2015_MAX_RUN;
- }
+ return runNumber > PHYS_RUN_2016_MAX_RUN;
+ }
+
+ /**
+ * Utility method to determine if a run number is from the Prop 2016.
+ *
+ * @param runNumber the run number
+ * @return <code>true</code> if run number is from the Prop 2016
+ */
+ public static boolean isPhysics2016Run(final int runNumber) {
+ return runNumber > ENG_RUN_2015_MAX_RUN && runNumber < PHYS_RUN_2016_MAX_RUN;
+ }
+
/**
* Reset the global static instance of the conditions manager to a new object.
@@ -263,6 +279,11 @@
* True if current run number is from Prop 2016.
*/
private boolean isProp2016Run = false;
+
+ /**
+ * True if current run number is from Physics run 2016.
+ */
+ private boolean isPhysics2016Run = false;
/**
* Flag used to print connection parameters one time.
@@ -712,22 +733,31 @@
// Clear the conditions cache.
// this.clearCache();
+
+ System.out.println("initializing with detector " + detectorName + " and run " + runNumber);
+
+
// Set flag if run number is from Test Run 2012 data.
if (isTestRun(runNumber)) {
this.isTestRun = true;
}
-
- System.out.println("initializing with detector " + detectorName + " and run " + runNumber);
-
if (isProp2016Run(runNumber)) {
- System.out.println("prop2016 pelle YES");
+ System.out.println("DB conditions manager: prop2016 YES");
this.isProp2016Run = true;
} else {
- System.out.println("prop2016 pelle NO");
+ System.out.println("DB conditions manager: prop2016 NO");
}
-
+ if (isPhysics2016Run(runNumber)) {
+ System.out.println("DB conditions manager: phys2016 YES");
+ this.isPhysics2016Run = true;
+ } else {
+ System.out.println("DB conditions manager: prop2016 NO");
+ }
+
+
+
// Is not configured yet?
if (!this.isConfigured) {
if (this.isTestRun()) {
@@ -835,6 +865,16 @@
}
/**
+ * Return <code>true</code> if Test Run configuration is active
+ *
+ * @return <code>true</code> if Test Run configuration is active
+ */
+ public boolean isPhysics2016Run() {
+ return this.isPhysics2016Run;
+ }
+
+
+ /**
* Load configuration information from an XML document.
*
* @param document the XML document
@@ -1176,4 +1216,15 @@
this.isFrozen = false;
LOGGER.info("conditions system unfrozen");
}
+
+
+
+ public static Enum RunPeriod {
+ TESTRUN2012 (0, TEST_RUN_MAX_RUN),
+ ENGRUN2015 (TEST_RUN_MAX_RUN, PHYS_RUN_2016_MAX_RUN),
+ ENGRUN2015 (TEST_RUN_MAX_RUN, PHYS_RUN_2016_MAX_RUN),
+
+ }
+
+
}
Modified: java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/AbstractSvtDetectorSetup.java
=============================================================================
--- java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/AbstractSvtDetectorSetup.java (original)
+++ java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/AbstractSvtDetectorSetup.java Sun Jul 17 10:52:47 2016
@@ -69,7 +69,7 @@
* @param conditions
* the conditions object
*/
- abstract protected void loadDefault(final Subdetector subdetector, final AbstractSvtConditions conditions);
+ public abstract void loadDefault(final Subdetector subdetector, final AbstractSvtConditions conditions);
/**
Modified: java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/EngRun2015SvtDetectorSetup.java
=============================================================================
--- java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/EngRun2015SvtDetectorSetup.java (original)
+++ java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/EngRun2015SvtDetectorSetup.java Sun Jul 17 10:52:47 2016
@@ -77,7 +77,7 @@
}
@Override
- protected void loadDefault(final Subdetector subdetector, final AbstractSvtConditions conditions) {
+ public void loadDefault(final Subdetector subdetector, final AbstractSvtConditions conditions) {
LOGGER.info("calling loaddefaut in EngRun2015SvtDetectorSetup");
LOGGER.info("loading default SVT conditions onto subdetector " + subdetector.getName());
@@ -98,21 +98,33 @@
// Loop over sensors.
for (final HpsSiSensor sensor : sensors) {
+ LOGGER.info("process sensor " + sensor.getName());
+
+
// Reset possible existing conditions data on sensor.
sensor.reset();
+ LOGGER.info("get daq pair for " + sensor.getName());
+
+
// Get DAQ pair (FEB ID, FEB Hybrid ID) corresponding to this sensor
final Pair<Integer, Integer> daqPair = getDaqPair(daqMap, sensor);
if (daqPair == null) {
throw new RuntimeException("Failed to find DAQ pair for sensor: " + sensor.getName());
}
+ LOGGER.info("set feb " + daqPair.getFirstElement() + " hyb " + daqPair.getSecondElement());
+
+
// Set the FEB ID of the sensor
sensor.setFebID(daqPair.getFirstElement());
// Set the FEB Hybrid ID of the sensor
sensor.setFebHybridID(daqPair.getSecondElement());
+
+ LOGGER.info("set orientation");
+
// Set the orientation of the sensor
final String orientation = daqMap.getOrientation(daqPair);
if (orientation != null && orientation.contentEquals(AbstractSvtDaqMapping.AXIAL)) {
@@ -121,16 +133,35 @@
sensor.setStereo(true);
}
+ LOGGER.info("find channels for this daq pair in channelMap");
+
+
// Find all the channels for this sensor.
final Collection<SvtChannel> channels = channelMap.find(daqPair);
+ if(channels == null) {
+ LOGGER.info(" No channels found");
+ throw new RuntimeException("error fiding channels");
+ }
+
+ LOGGER.info(" found " + channels.size() + " channels");
+
// Loop over the channels of the sensor.
for (final SvtChannel channel : channels) {
+ LOGGER.info(" process channel " + channel.toString());
+
+
// Get conditions data for this channel.
final ChannelConstants constants = engRun2015Conditions.getChannelConstants(channel);
final int channelNumber = channel.getChannel();
+ LOGGER.info(" channelNumber " + channelNumber);
+
+ LOGGER.info(" constants: " + constants.toString());
+
+
+
//
// Set conditions data for this channel on the sensor object:
//
@@ -139,23 +170,35 @@
sensor.setBadChannel(channelNumber);
}
+ LOGGER.info(" set pedestal and noise ");
+
// Set the pedestal and noise of each of the samples for the
// channel
final double[] pedestal = new double[PEDESTAL_COUNT];
final double[] noise = new double[NOISE_COUNT];
for (int sampleN = 0; sampleN < HpsSiSensor.NUMBER_OF_SAMPLES; sampleN++) {
+ LOGGER.info(" sampleN " + sampleN);
pedestal[sampleN] = constants.getCalibration().getPedestal(sampleN);
+ LOGGER.info(" sampleN " + sampleN);
noise[sampleN] = constants.getCalibration().getNoise(sampleN);
}
sensor.setPedestal(channelNumber, pedestal);
sensor.setNoise(channelNumber, noise);
+
+ LOGGER.info(" set gain ");
+
// Set the gain and offset for the channel
sensor.setGain(channelNumber, constants.getGain().getGain());
sensor.setOffset(channelNumber, constants.getGain().getOffset());
+ LOGGER.info(" set shape fit parameters ");
+
// Set the shape fit parameters
sensor.setShapeFitParameters(channelNumber, constants.getShapeFitParameters().toArray());
+
+ LOGGER.info(" done processing channel");
+
}
// Set the t0 shift for the sensor.
Modified: java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/Prop2016SvtDetectorSetup.java
=============================================================================
--- java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/Prop2016SvtDetectorSetup.java (original)
+++ java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/Prop2016SvtDetectorSetup.java Sun Jul 17 10:52:47 2016
@@ -32,7 +32,7 @@
}
@Override
- protected void loadDefault(Subdetector subdetector, AbstractSvtConditions conditions) {
+ public void loadDefault(Subdetector subdetector, AbstractSvtConditions conditions) {
LOGGER.info("calling loaddefaut in Prop2016SvtDetectorSetup");
super.loadDefault(subdetector, conditions);
}
Modified: java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/TestRunSvtDetectorSetup.java
=============================================================================
--- java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/TestRunSvtDetectorSetup.java (original)
+++ java/branches/layer0-branch/detector-model/src/main/java/org/hps/detector/svt/TestRunSvtDetectorSetup.java Sun Jul 17 10:52:47 2016
@@ -76,7 +76,7 @@
-protected void loadDefault(final Subdetector subdetector, final AbstractSvtConditions conditions) {
+public void loadDefault(final Subdetector subdetector, final AbstractSvtConditions conditions) {
LOGGER.info("loading Test Run SVT conditions onto subdetector " + subdetector.getName());
Modified: java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014ConverterBase.java
=============================================================================
--- java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014ConverterBase.java (original)
+++ java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014ConverterBase.java Sun Jul 17 10:52:47 2016
@@ -1,5 +1,8 @@
package org.lcsim.detector.converter.compact;
+import java.util.logging.Logger;
+
+import org.hps.conditions.api.ConditionsObjectException;
import org.jdom.Element;
import org.lcsim.detector.DetectorElement;
import org.lcsim.detector.DetectorElementStore;
@@ -131,7 +134,23 @@
((HpsTracker2) subdet.getDetectorElement()).createStereoLayers();
if(_debug) System.out.printf("%s: DONE create stereo layers\n", getClass().getSimpleName());
-
+
+ if(_debug) System.out.printf("%s: load conditions for subdet name %s for detector %s\n", getClass().getSimpleName(), subdet.getName(), detector.getName());
+
+ try {
+ ((HpsTracker2) subdet.getDetectorElement()).loadConditions(subdet,detector);
+ } catch (ConditionsObjectException e) {
+ System.out.printf("%s: caught excpetion %s\n", getClass().getSimpleName(), e.getMessage());
+ //throw new RuntimeException("Couldn't setup conditions.", e);
+ if(1==1) throw new RuntimeException("Couldn't setup conditi");
+ if(1==1) {
+ System.out.println("i should never get here");
+ System.exit(1);
+ }
+ }
+
+ if(_debug) System.out.printf("%s: DONE load conditions\n", getClass().getSimpleName());
+
if(_debug) printDEs();
}
Modified: java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/subdetector/HpsTracker2.java
=============================================================================
--- java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/subdetector/HpsTracker2.java (original)
+++ java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/subdetector/HpsTracker2.java Sun Jul 17 10:52:47 2016
@@ -3,10 +3,26 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.hps.conditions.api.ConditionsObjectException;
+import org.hps.conditions.api.ConditionsRecord.ConditionsRecordCollection;
+import org.hps.conditions.database.DatabaseConditionsManager;
+import org.hps.conditions.svt.SvtConditions;
+import org.hps.detector.svt.AbstractSvtDetectorSetup;
+import org.hps.detector.svt.EngRun2015SvtDetectorSetup;
+import org.hps.detector.svt.Prop2016SvtDetectorSetup;
+import org.hps.detector.svt.TestRunSvtDetectorSetup;
+import org.lcsim.conditions.ConditionsManager;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.converter.compact.SubdetectorDetectorElement;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
+import org.lcsim.geometry.compact.Detector;
+import org.lcsim.geometry.compact.Subdetector;
/**
* Class describing an {@link HPSTracker2} subdetector.
*
@@ -15,14 +31,22 @@
*
*/
public class HpsTracker2 extends SubdetectorDetectorElement {
-
+
private boolean debug = false;
-
+ /**
+ * Initialize the logger.
+ */
+ //private static Logger LOGGER = Logger.getLogger(HpsTracker2.class.getPackage().getName());
+ private static Logger LOGGER = Logger.getLogger(HpsTracker2.class.getName());
+
// List of stereo layers composing the SVT
- List<SvtStereoLayer> stereoPairs = new ArrayList<SvtStereoLayer>();
+ List<SvtStereoLayer> stereoPairs = new ArrayList<SvtStereoLayer>();
+ final private boolean checkDetectorTypeAndCondType = true;
public HpsTracker2(String name, IDetectorElement parent) {
super(name, parent);
+ LOGGER.setLevel(Level.ALL);
+ System.out.println("logger level " + LOGGER.getName() + " " + LOGGER.getLevel().getName());
}
/**
@@ -126,4 +150,132 @@
}
}
}
+
+ private boolean checkConditionsSystem() {
+
+ boolean pass = true;
+
+ System.out.println("get cond db manager");
+
+ DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
+
+ System.out.println("check for keys");
+
+ ConditionsRecordCollection col = manager.getConditionsRecords();
+
+ System.out.println("got " + col.size() + " size collections");
+
+ Set<String> keys = col.getConditionsKeys();
+
+ System.out.println("got " + keys.size() + " keys");
+ for(String key : keys) {
+ System.out.println("key \"" + key + "\"");
+ }
+
+ return pass;
+ }
+
+ public void loadConditions(Subdetector subdet, Detector detector) throws ConditionsObjectException {
+
+ System.out.printf("%s: logger level %s %s \n", this.getClass().getSimpleName(), LOGGER.getName(), LOGGER.getLevel().getName());
+
+
+ System.out.printf("%s:Load conditions. \n", this.getClass().getSimpleName());
+
+ if(checkConditionsSystem()) {
+ LOGGER.info("Conditions system setup.");
+ } else {
+ LOGGER.warning("Conditions system not setup properly.");
+ throw new ConditionsObjectException("SVT conditions not loaded since conditions system failed to pass setup checks.");
+ }
+
+ DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
+
+ // Use the old SVT Detector Setup here.
+
+ System.out.printf("%s: create the svtDetectorSetup object \n", this.getClass().getSimpleName());
+
+
+ // Since we know what detector is being setup we can check that
+ // whatever run type is identified in the job setup and passed to the DB conditions manager
+ // makes sense.
+ // TODO: not sure how to handle this -> FIX THIS.
+ boolean detectorMakesSense = false;
+
+ AbstractSvtDetectorSetup svtDetectorSetup;
+
+ System.out.printf("%s: Check which SvtDetectorSetup to be used. Conditions manager has run %d and detector %s \n",
+ this.getClass().getSimpleName(), manager.getRun(), manager.getDetector());
+
+ // The SvtDetectorSetup being abstracted allows more flexibility but perhaps it's unnecessary.
+
+
+ String detectorType = getDetectorType(detector);
+
+ if( manager.isTestRun() ) {
+ System.out.printf("%s: Use TestRunSvtDetectorSetup\n", this.getClass().getSimpleName());
+ svtDetectorSetup = new TestRunSvtDetectorSetup();
+ detectorMakesSense = detectorType == "testrun";
+ }
+ else if(manager.isPhysics2016Run()) {
+ System.out.printf("%s: Use EngRun2015SvtDetectorSetup\n", this.getClass().getSimpleName());
+ svtDetectorSetup = new EngRun2015SvtDetectorSetup();
+ detectorMakesSense = detectorType == "physrun2016";
+ }
+ else if(manager.isProp2016Run()) {
+ System.out.printf("%s: Use Prop2016SvtDetectorSetup\n", this.getClass().getSimpleName());
+ svtDetectorSetup = new Prop2016SvtDetectorSetup();
+ detectorMakesSense = detectorType == "prop2016";
+ }
+ else {
+ System.out.printf("%s: Use EngRun2015SvtDetectorSetup\n", this.getClass().getSimpleName());
+ svtDetectorSetup = new EngRun2015SvtDetectorSetup();
+ detectorMakesSense = detectorType == "engrun2015";
+ }
+
+
+ if(detectorMakesSense) {
+ System.out.printf("%s: Detector %s and detector setup makes sense\n",getClass().getSimpleName(),detector.getName());
+
+ } else {
+ System.out.printf("%s: Detector %s and detector setup do not make sense\n",getClass().getSimpleName(),detector.getName());
+ if(checkDetectorTypeAndCondType ) {
+ throw new RuntimeException("Detector and conditions for it doens't make sense.");
+ }
+ }
+
+
+ System.out.printf("%s: activating default setup\n", this.getClass().getSimpleName());
+ final SvtConditions svtConditions = manager.getCachedConditions(SvtConditions.class, "svt_conditions")
+ .getCachedData();
+ if( !(svtConditions instanceof SvtConditions))
+ throw new RuntimeException("The conditions are of the wrong type ");
+ else
+ System.out.printf("%s: svtConditions are correct instance.\n", this.getClass().getSimpleName());
+
+ System.out.printf("%s: Load default on the svtDetectorSetup for subdet name %s for detector %s\n", getClass().getSimpleName(), subdet.getName(), detector.getName());
+
+
+ svtDetectorSetup.loadDefault(subdet, svtConditions);
+
+ System.out.printf("%s: Load cond itions done.\n", getClass().getSimpleName());
+
+
+ }
+
+ private String getDetectorType(Detector detector) {
+ String name = detector.getName();
+
+ if( Pattern.matches("HPS.*TestRun.*", name))
+ return "testrun";
+ else if( Pattern.matches("HPS.*EngRun2015.*", name))
+ return "engrun2015";
+ else if( Pattern.matches("HPS.*Proposal2016.*", name))
+ return "prop2016";
+ else if( Pattern.matches("HPS.*PhysicsRun2016.*", name))
+ return "physrun2016";
+ else {
+ return "";
+ }
+ }
}
Modified: java/branches/layer0-branch/job/src/main/java/org/hps/job/JobManager.java
=============================================================================
--- java/branches/layer0-branch/job/src/main/java/org/hps/job/JobManager.java (original)
+++ java/branches/layer0-branch/job/src/main/java/org/hps/job/JobManager.java Sun Jul 17 10:52:47 2016
@@ -7,6 +7,7 @@
import org.hps.detector.svt.AbstractSvtDetectorSetup;
import org.hps.detector.svt.Prop2016SvtDetectorSetup;
import org.hps.detector.svt.TestRunSvtDetectorSetup;
+import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
import org.lcsim.job.JobControlManager;
import org.lcsim.util.Driver;
@@ -41,8 +42,13 @@
* @param is the input stream containing config information
*/
public void setup(InputStream is) {
+
+ System.out.println("JobManager: setup(stream) is called");
+
// Add class that will setup SVT detector with conditions data (this is awkward but has to be done someplace).
+
+ /*
AbstractSvtDetectorSetup svtDetectorSetup;
@@ -61,13 +67,54 @@
//svtDetectorSetup = new EngRun2015SvtDetectorSetup();
svtDetectorSetup = new Prop2016SvtDetectorSetup();
}
-
DatabaseConditionsManager.getInstance().addConditionsListener(svtDetectorSetup);
+ */
+
+ System.out.println("JobManager: get an instance of the cond manager");
+
+ DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
+
+ if(this.getDetectorName() != null) {
+ System.out.println("JobManager: call setDetector with detector \"" + this.getDetectorName() + "\" and run " + this.getRunNumber());
+ int run = 0;
+ if(this.getRunNumber() != null) {
+ run = this.getRunNumber();
+ } else
+ run = 0;
+
+ System.out.println("JobManager: call setDetector with detector \"" + this.getDetectorName() + "\" and run " + this.getRunNumber());
+
+ try {
+ manager.setDetector(this.getDetectorName(), this.getRunNumber());
+ } catch (ConditionsNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ System.out.println("JobManager: after setDetector");
+
+ manager.freeze();
+
+ } else {
+ System.out.println("JobManager: no detector set at this point so don't call setDetector");
+ }
+
+
+ System.out.println("JobManager: cond manager frozen? " + (manager.isFrozen() ? "YES" : "NO"));
+
+
+ System.out.println("JobManager: call lcsim (super class) setup");
+
super.setup(is);
-
+
+ System.out.println("JobManager: setup conditions driver");
+
+
// Setup the conditions system if there is a ConditionsDriver present.
- this.setupConditionsDriver();
+ //this.setupConditionsDriver();
+
+ System.out.println("JobManager: setup DONE");
+
}
/**
@@ -78,9 +125,15 @@
@Override
public final boolean run() {
+ System.out.println("JobManager run() is called");
+
+
// Run the job.
final boolean result = super.run();
+ System.out.println("JobManager after super.run()");
+
+
// Close the conditions database connection if it is open.
DatabaseConditionsManager.getInstance().closeConnection();
Modified: java/branches/layer0-branch/logging/src/main/resources/org/hps/logging/config/logging.properties
=============================================================================
--- java/branches/layer0-branch/logging/src/main/resources/org/hps/logging/config/logging.properties (original)
+++ java/branches/layer0-branch/logging/src/main/resources/org/hps/logging/config/logging.properties Sun Jul 17 10:52:47 2016
@@ -25,7 +25,7 @@
# conditions
org.hps.conditions.api.level = WARNING
org.hps.conditions.database.level = FINEST
-org.hps.conditions.cli.level = CONFIG
+org.hps.conditions.cli.level = FINEST
org.hps.conditions.ecal.level = WARNING
org.hps.conditions.svt.level = FINEST
@@ -73,8 +73,9 @@
org.hps.monitoring.application.level = ALL
# detector-model
-org.lcsim.detector.converter.compact.level = INFO
-org.lcsim.geometry.compact.converter.level = INFO
+org.lcsim.detector.converter.compact.level = FINEST
+org.lcsim.geometry.compact.converter.level = FINEST
+org.lcsim.geometry.level = FINEST
org.hps.detector.svt.level = ALL
# test data
Modified: java/branches/layer0-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim
=============================================================================
--- java/branches/layer0-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim (original)
+++ java/branches/layer0-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim Sun Jul 17 10:52:47 2016
@@ -19,8 +19,8 @@
<drivers>
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <detectorName>${detector}</detectorName>
- <runNumber>10000</runNumber>
+ <!--<detectorName>${detector}</detectorName>-->
+ <!-- <runNumber>10000</runNumber>-->
<!--<runNumber>${run}</runNumber>-->
<freeze>true</freeze>
</driver>
|
