Author: [log in to unmask]
Date: Tue Feb 24 15:32:52 2015
New Revision: 3554
Log:
Change debug level
Modified:
projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java
projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerJavaBuilder.java
projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java
projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java
projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolumeImpl.java
Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java
=============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java (original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java Tue Feb 24 15:32:52 2015
@@ -2260,10 +2260,8 @@
// use default layer numbering for L1-3
if(layer<4) {
- int l = getOldLayerDefinition(isTopLayer, layer, isAxial);
- System.out.printf("%s: %s %d %s -> MP layer %d\n",getClass().getSimpleName(),isTopLayer?"top":"bottom", layer, isAxial?"axial":"stereo", l);
- return l;
- }
+ return getOldLayerDefinition(isTopLayer, layer, isAxial);
+ }
// hole or slot
boolean isHole = isHoleFromName(name);
@@ -2329,7 +2327,7 @@
if(l<0) throw new RuntimeException("Error getting the millepede layer.");
- System.out.printf("%s: %s %d %s %s -> MP layer %d\n",getClass().getSimpleName(),isTopLayer?"top":"bottom", layer, isAxial?"axial":"stereo", isHole?"hole":"slot", l);
+ if(isDebug()) System.out.printf("%s: %s %d %s %s -> MP layer %d\n",getClass().getSimpleName(),isTopLayer?"top":"bottom", layer, isAxial?"axial":"stereo", isHole?"hole":"slot", l);
return l;
Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerJavaBuilder.java
=============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerJavaBuilder.java (original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerJavaBuilder.java Tue Feb 24 15:32:52 2015
@@ -15,7 +15,7 @@
public abstract class HPSTrackerJavaBuilder implements IHPSTrackerJavaBuilder {
- protected boolean _debug = true;
+ protected boolean _debug = false;
private JavaSurveyVolume baseSurveyVolume;
protected List<JavaSurveyVolume> javaSurveyVolumes = new ArrayList<JavaSurveyVolume>();
protected DetectorIdentifierHelper detectorIdentifierHelper;
Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java
=============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java (original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java Tue Feb 24 15:32:52 2015
@@ -176,7 +176,7 @@
setPos(new Translation3D(box_center.x(), box_center.y(), box_center.z()));
setRot(new RotationGeant(lcdd_rot_angles.x(), lcdd_rot_angles.y(), lcdd_rot_angles.z()));
- //if(isDebug()) {
+ if(isDebug()) {
System.out.printf("%s: SurveyVolume information for %s:\n", this.getClass().getSimpleName(), base.getName());
System.out.printf("%s: box_center_base_local %s\n", this.getClass().getSimpleName(), box_center_base_local.toString());
@@ -205,7 +205,7 @@
System.out.printf("%s: euler %s\n", this.getClass().getSimpleName(), lcdd_rot_angles.toString());
System.out.printf("%s: rot %s\n", this.getClass().getSimpleName(), getRot().toString());
- //}
+ }
}
Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java
=============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java (original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java Tue Feb 24 15:32:52 2015
@@ -16,7 +16,7 @@
*
*/
public abstract class SurveyVolume {
- protected boolean debug = true;
+ protected boolean debug = false;
private String name;
private String material = "Vacuum";
private SurveyVolume mother = null;
@@ -78,7 +78,7 @@
if(referenceGeom!=null) {
- System.out.printf("%s: apply reference transformation for %s\n",this.getClass().getSimpleName(),getName());
+ if(debug) System.out.printf("%s: apply reference transformation for %s\n",this.getClass().getSimpleName(),getName());
if(debug) System.out.printf("%s: coord system before %d ref transformations:\n%s\n",this.getClass().getSimpleName(),referenceGeom.size(),getCoord().toString());
@@ -100,7 +100,7 @@
} else {
- System.out.printf("%s: no reference transformation exists for %s\n",this.getClass().getSimpleName(),getName());
+ if(debug) System.out.printf("%s: no reference transformation exists for %s\n",this.getClass().getSimpleName(),getName());
}
@@ -114,7 +114,7 @@
if(alignmentCorrections!=null) {
- System.out.printf("%s: Apply alignment corrections to %s\n",this.getClass().getSimpleName(),this.getName());
+ if(debug_local || debug) System.out.printf("%s: Apply alignment corrections to %s\n",this.getClass().getSimpleName(),this.getName());
// translate
if(alignmentCorrections.getTranslation()!=null) {
@@ -201,7 +201,7 @@
if(debug_local || debug) System.out.printf("%s: coordinate system after alignment corrections:\n%s\n",this.getClass().getSimpleName(),getCoord().toString());
} else {
- System.out.printf("%s: no alignment corrections exist for %s\n",this.getClass().getSimpleName(),this.getName());
+ if(debug_local || debug) System.out.printf("%s: no alignment corrections exist for %s\n",this.getClass().getSimpleName(),this.getName());
}
}
Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolumeImpl.java
=============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolumeImpl.java (original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolumeImpl.java Tue Feb 24 15:32:52 2015
@@ -4,7 +4,7 @@
public abstract class SurveyVolumeImpl extends SurveyVolumeVisualization {
- private boolean debug = true;
+ private boolean debug = false;
protected SurveyVolume surveyVolume = null;
public SurveyVolumeImpl(SurveyVolume surveyVolume) {
########################################################################
Use REPLY-ALL to reply to list
To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1
