Author: [log in to unmask]
Date: Fri Aug 5 16:17:19 2016
New Revision: 4446
Log:
mostly debug.
Modified:
java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2017Converter.java
java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java
java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014JavaBuilder.java
java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017GeometryDefinition.java
java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017JavaBuilder.java
java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/subdetector/HPSTracker2017.java
java/branches/layer0-thin-branch/logging/src/main/resources/org/hps/logging/config/logging.properties
java/branches/layer0-thin-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim
Modified: java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2017Converter.java
=============================================================================
--- java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2017Converter.java (original)
+++ java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2017Converter.java Fri Aug 5 16:17:19 2016
@@ -1,10 +1,10 @@
package org.lcsim.detector.converter.compact;
import org.jdom.Element;
-import org.lcsim.geometry.compact.converter.HPSTracker2016JavaBuilder;
+import org.lcsim.geometry.compact.converter.HPSTracker2017JavaBuilder;
import org.lcsim.geometry.compact.converter.HPSTrackerBuilder;
import org.lcsim.geometry.compact.converter.HPSTrackerJavaBuilder;
-import org.lcsim.geometry.subdetector.HPSTracker2016;
+import org.lcsim.geometry.subdetector.HPSTracker2017;
public class HPSTracker2017Converter extends HPSTracker2014v1Converter {
@@ -19,7 +19,7 @@
* initializeBuilder(org.jdom.Element)
*/
protected HPSTrackerJavaBuilder initializeBuilder(Element node) {
- return new HPSTracker2016JavaBuilder(_debug, node);
+ return new HPSTracker2017JavaBuilder(_debug, node);
}
/*
@@ -29,7 +29,7 @@
* getSubdetectorType()
*/
public Class getSubdetectorType() {
- return HPSTracker2016.class;
+ return HPSTracker2017.class;
}
/*
Modified: java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java
=============================================================================
--- java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java (original)
+++ java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java Fri Aug 5 16:17:19 2016
@@ -1343,14 +1343,22 @@
}
}
-
+
+
+
+ public abstract static class BaseSensor extends HalfModuleComponent {
+ public BaseSensor(String name, SurveyVolume mother, AlignmentCorrection alignmentCorrection, int id) {
+ super(name, mother, alignmentCorrection, id);
+ }
+ }
+
/**
* Silicon sensor @SurveyVolume.
* The coordinate system is located at the same position and orientation as the half-module.
* @author Per Hansson Adrian <[log in to unmask]>
*
*/
- public static class Sensor extends HalfModuleComponent {
+ public static class Sensor extends BaseSensor {
static final double length= 100.00;
static final double width = 40.34;
static final double thickness = 0.32;
@@ -1409,6 +1417,8 @@
return length;
}
}
+
+
/**
* Active part of the @Sensor @SurveyVolume.
Modified: java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014JavaBuilder.java
=============================================================================
--- java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014JavaBuilder.java (original)
+++ java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014JavaBuilder.java Fri Aug 5 16:17:19 2016
@@ -7,6 +7,7 @@
import org.jdom.Element;
import org.lcsim.detector.ILogicalVolume;
+import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition.BaseSensor;
import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition.Sensor;
import org.lcsim.geometry.compact.converter.HPSTracker2014GeometryDefinition.LongHalfModuleBundle;
import org.lcsim.geometry.compact.converter.HPSTracker2014GeometryDefinition.LongModuleBundle;
@@ -98,7 +99,8 @@
// Check that it had a mother
if(mother==null) throw new RuntimeException("Cound't find mother to module " + m.module.getName());
- if(isDebug()) System.out.printf("%s: found mother %s to module %s\n", getClass().getSimpleName(),mother.getName(),m.module.getName());
+ //if(isDebug())
+ System.out.printf("%s: found ewfsdhf mother %s to module %s\n", getClass().getSimpleName(),mother.getName(),m.module.getName());
// put the module in the list of objects that will be added to LCDD
addModule(m, mother);
@@ -108,7 +110,8 @@
}
- if(isDebug()) System.out.printf("%s: DONE build JAVA modules\n", getClass().getSimpleName());
+ //if(isDebug())
+ System.out.printf("%s: DONE build JAVA modules\n", getClass().getSimpleName());
//System.out.printf("%s: Built %d JAVA geometry objects\n", getClass().getSimpleName(),javaSurveyVolumes.size());
@@ -133,7 +136,7 @@
* @param bundle - module to be added
* @param mother - mother JAVA geometry object
*/
- private void addModule(BaseModuleBundle bundle, JavaSurveyVolume mother) {
+ protected void addModule(BaseModuleBundle bundle, JavaSurveyVolume mother) {
if(bundle instanceof TestRunModuleBundle) {
addTestRunModule((TestRunModuleBundle) bundle, mother);
} else if(bundle instanceof LongModuleBundle) {
@@ -148,7 +151,7 @@
* @param bundle - module to be added
* @param mother - mother LCDD geometry object
*/
- private void addLongModule(LongModuleBundle bundle, JavaSurveyVolume mother) {
+ protected void addLongModule(LongModuleBundle bundle, JavaSurveyVolume mother) {
// This could perhaps be fixed if there is a relation with daughters in geometry definition?
// create the module
JavaSurveyVolume lcddM = new JavaGhostSurveyVolume(bundle.module, mother);
@@ -162,30 +165,52 @@
- private void addLongHalfModule(HalfModuleBundle bundle2, JavaSurveyVolume mother) {
- LongHalfModuleBundle bundle = (LongHalfModuleBundle) bundle2;
+ protected void addLongHalfModule(HalfModuleBundle bundle2, JavaSurveyVolume mother) {
+
+ System.out.printf("what3\n");
+
+ LongHalfModuleBundle bundle = (LongHalfModuleBundle) bundle2;
+
+ System.out.printf("what34\n");
+
// Create the half-module
// This is not a ghost element but reflects the module
// concept in the old compact description
int oldCompactModuleId = 0;
JavaSurveyVolume lcddHM = new JavaSurveyVolume(bundle.halfModule, mother,oldCompactModuleId);
+
+
+ System.out.printf("what344\n");
+
add(lcddHM);
+
+ System.out.printf("what33\n");
+
// ComponentNumber is taken from old geometry where it is simply a counter when adding the xml daughters to the TestRunModule.
// It is simply 0 for sensor and 1 for carbon fiber in the old geometry
- int componentNumber = ((Sensor)bundle.sensor).getId();
-
+ int componentNumber = ((BaseSensor) bundle.sensor).getId();
+
+ System.out.printf("what333\n");
+
+
// create the sensor
JavaSurveyVolume lcddS = new JavaSurveyVolume(bundle.sensor, lcddHM, componentNumber);
add(lcddS);
+
+ System.out.printf("what3333\n");
+
// create the active sensor
JavaSurveyVolume lcddAS = new JavaSurveyVolume(bundle.activeSensor, lcddS, componentNumber);
add(lcddAS);
+
+ System.out.printf("what33333\n");
+
// if(isDebug()) {
-// System.out.printf("%s: added sensor %s \n",this.getClass().getSimpleName(), lcddS.getName());
-// System.out.printf("%s: local coordinate system\n%s\n",this.getClass().getSimpleName(), bundle.sensor.getCoord().toString());
+ System.out.printf("%s: added sensor %s \n",this.getClass().getSimpleName(), lcddS.getName());
+ System.out.printf("%s: local coordinate system\n%s\n",this.getClass().getSimpleName(), bundle.sensor.getCoord().toString());
// dsd
// }
Modified: java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017GeometryDefinition.java
=============================================================================
--- java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017GeometryDefinition.java (original)
+++ java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017GeometryDefinition.java Fri Aug 5 16:17:19 2016
@@ -10,7 +10,9 @@
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
import org.jdom.Element;
import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition.BaseModule;
+import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition.BaseSensor;
import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition.HalfModuleComponent;
+import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition.Sensor;
/**
*
@@ -653,7 +655,7 @@
* @author Per Hansson Adrian <[log in to unmask]>
*
*/
- public static class ShortSensor extends HalfModuleComponent {
+ public static class ShortSensor extends BaseSensor {
static final double length= 10.00 + 1.00;
static final double width = 14.080 + 2*0.250;
static final double thickness = 0.250;
@@ -665,6 +667,8 @@
public static double getSensorThickness() {
return height;
}
+
+ @Override
protected void setPos() {
if(debug) System.out.printf("%s: setPos for %s\n",this.getClass().getSimpleName(),getName());
@@ -680,9 +684,13 @@
}
}
+
+ @Override
protected void setCenter() {
setCenter(0,0,0);
}
+
+ @Override
protected void setBoxDim() {
if(useSiStripsConvention) {
setBoxDim(width,length,thickness);
@@ -690,15 +698,23 @@
setBoxDim(length,thickness,width);
}
}
+
+ @Override
protected double getThickness() {
return thickness;
}
+
+ @Override
protected double getHeigth() {
return thickness;
}
+
+ @Override
protected double getWidth() {
return width;
}
+
+ @Override
protected double getLength() {
return length;
}
@@ -1060,7 +1076,7 @@
* @author Per Hansson Adrian <[log in to unmask]>
*
*/
- public static class ShortHalfModuleBundle extends HalfModuleBundle {
+ public static class ShortHalfModuleBundle extends LongHalfModuleBundle {
public ShortHalfModuleBundle() {
super();
}
Modified: java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017JavaBuilder.java
=============================================================================
--- java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017JavaBuilder.java (original)
+++ java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017JavaBuilder.java Fri Aug 5 16:17:19 2016
@@ -1,6 +1,10 @@
package org.lcsim.geometry.compact.converter;
import org.jdom.Element;
+import org.lcsim.geometry.compact.converter.HPSTracker2014GeometryDefinition.LongModuleBundle;
+import org.lcsim.geometry.compact.converter.HPSTracker2017GeometryDefinition.ShortModuleBundle;
+import org.lcsim.geometry.compact.converter.HPSTrackerBuilder.BaseModuleBundle;
+import org.lcsim.geometry.compact.converter.HPSTrackerGeometryDefinition.TestRunModuleBundle;
public class HPSTracker2017JavaBuilder extends HPSTracker2014v1JavaBuilder {
@@ -10,8 +14,52 @@
@Override
public HPSTrackerGeometryDefinition createGeometryDefinition(boolean debug, Element node) {
- return new HPSTracker2016GeometryDefinition(debug, node);
+ return new HPSTracker2017GeometryDefinition(debug, node);
}
+
+ protected void addModule(BaseModuleBundle bundle, JavaSurveyVolume mother) {
+
+ System.out.println("what");
+ if(bundle instanceof TestRunModuleBundle) {
+ addTestRunModule((TestRunModuleBundle) bundle, mother);
+ } else if(bundle instanceof ShortModuleBundle) {
+ addShortModule((ShortModuleBundle) bundle, mother);
+
+ } else if(bundle instanceof LongModuleBundle) {
+ addLongModule((LongModuleBundle) bundle, mother);
+ } else {
+ throw new RuntimeException("The bundle is of unknown class type!");
+ }
+ System.out.println("what2");
+ }
+
+
+
+
+
+ /**
+ * Rules for adding the LCDD module geometry.
+ * @param bundle - module to be added
+ * @param mother - mother LCDD geometry object
+ */
+ protected void addShortModule(ShortModuleBundle bundle, JavaSurveyVolume mother) {
+ // This could perhaps be fixed if there is a relation with daughters in geometry definition?
+ // create the module
+
+ System.out.println("what22");
+
+ JavaSurveyVolume lcddM = new JavaGhostSurveyVolume(bundle.module, mother);
+ add(lcddM);
+ if(bundle.halfModuleAxialHole!=null) addLongHalfModule(bundle.halfModuleAxialHole,lcddM);
+ if(bundle.halfModuleAxialSlot!=null) addLongHalfModule(bundle.halfModuleAxialSlot,lcddM);
+ //if(bundle.coldBlock!=null) add(new LCDDSurveyVolume(bundle.coldBlock, lcdd, lcddM));
+ if(bundle.halfModuleStereoHole!=null) addLongHalfModule(bundle.halfModuleStereoHole,lcddM);
+ if(bundle.halfModuleStereoSlot!=null) addLongHalfModule(bundle.halfModuleStereoSlot,lcddM);
+
+ System.out.println("what222");
+ }
+
+
}
Modified: java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/subdetector/HPSTracker2017.java
=============================================================================
--- java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/subdetector/HPSTracker2017.java (original)
+++ java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/subdetector/HPSTracker2017.java Fri Aug 5 16:17:19 2016
@@ -1,15 +1,32 @@
package org.lcsim.geometry.subdetector;
+
+import hep.graphics.heprep.HepRep;
+import hep.graphics.heprep.HepRepFactory;
import org.jdom.Element;
import org.jdom.JDOMException;
+import org.lcsim.detector.converter.heprep.DetectorElementToHepRepConverter;
-public class HPSTracker2017 extends HPSTracker2014v1 {
-
- public HPSTracker2017(Element node) throws JDOMException
- {
- super(node);
+ public class HPSTracker2017 extends AbstractTracker {
+
+ public HPSTracker2017(Element node) throws JDOMException
+ {
+ super(node);
+ }
+
+ public void appendHepRep(HepRepFactory factory, HepRep heprep)
+ {
+ DetectorElementToHepRepConverter.convert(getDetectorElement(), factory, heprep, -1, false, getVisAttributes().getColor());
+ }
+
+ public boolean isEndcap() {
+ return false;
+ }
+
+ public boolean isBarrel() {
+ return true;
+ }
+
}
-
-}
Modified: java/branches/layer0-thin-branch/logging/src/main/resources/org/hps/logging/config/logging.properties
=============================================================================
--- java/branches/layer0-thin-branch/logging/src/main/resources/org/hps/logging/config/logging.properties (original)
+++ java/branches/layer0-thin-branch/logging/src/main/resources/org/hps/logging/config/logging.properties Fri Aug 5 16:17:19 2016
@@ -18,15 +18,15 @@
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
# lcsim job
-org.lcsim.job.level = CONFIG
+org.lcsim.job.level = FINEST
org.lcsim.job.EventMarkerDriver.level = ALL
org.lcsim.job.EventPrintLoopAdapter = ALL
# conditions
-org.hps.conditions.api.level = WARNING
+org.hps.conditions.api.level = FINEST
org.hps.conditions.database.level = FINEST
-org.hps.conditions.cli.level = CONFIG
-org.hps.conditions.ecal.level = WARNING
+org.hps.conditions.cli.level = FINEST
+org.hps.conditions.ecal.level = FINEST
org.hps.conditions.svt.level = FINEST
# monitoring-drivers
Modified: java/branches/layer0-thin-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim
=============================================================================
--- java/branches/layer0-thin-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim (original)
+++ java/branches/layer0-thin-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim Fri Aug 5 16:17:19 2016
@@ -21,7 +21,6 @@
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
<detectorName>${detector}</detectorName>
<runNumber>10000</runNumber>
- <!--<runNumber>${run}</runNumber>-->
<freeze>true</freeze>
</driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
