Author: [log in to unmask] Date: Wed Dec 10 18:24:25 2014 New Revision: 3447 Log: fix phys vol id's Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014Converter.java projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014ConverterBase.java Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java ============================================================================= --- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java (original) +++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java Wed Dec 10 18:24:25 2014 @@ -50,8 +50,8 @@ /* (non-Javadoc) * @see org.lcsim.detector.converter.compact.HPSTracker2014ConverterBase#getModuleNumber(org.lcsim.geometry.compact.converter.JavaSurveyVolume) */ - protected int getModuleNumber(JavaSurveyVolume surveyVolume) { - return HPSTrackerBuilder.getHalfFromName(surveyVolume.getName()).equals("top") ? 0 : 1; + protected int getModuleNumber(String surveyVolume) { + return HPSTrackerBuilder.getHalfFromName(surveyVolume).equals("top") ? 0 : 1; } } Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014Converter.java ============================================================================= --- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014Converter.java (original) +++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014Converter.java Wed Dec 10 18:24:25 2014 @@ -49,15 +49,15 @@ /* (non-Javadoc) * @see org.lcsim.detector.converter.compact.HPSTracker2014ConverterBase#getModuleNumber(org.lcsim.geometry.compact.converter.JavaSurveyVolume) */ - protected int getModuleNumber(JavaSurveyVolume surveyVolume) { - boolean isTopLayer = HPSTrackerBuilder.getHalfFromName(surveyVolume.getName()).equals("top") ? true : false; - int layer = HPSTrackerBuilder.getLayerFromVolumeName(surveyVolume.getName()); + protected int getModuleNumber(String surveyVolume) { + boolean isTopLayer = HPSTrackerBuilder.getHalfFromName(surveyVolume).equals("top") ? true : false; + int layer = HPSTrackerBuilder.getLayerFromVolumeName(surveyVolume); int moduleNumber = -1; if(isTopLayer) { if(layer < 4 ) { moduleNumber = 0; } else { - if(HPSTrackerBuilder.isHoleFromName(surveyVolume.getName())) { + if(HPSTrackerBuilder.isHoleFromName(surveyVolume)) { moduleNumber = 2; } else { moduleNumber = 0; @@ -67,7 +67,7 @@ if(layer < 4 ) { moduleNumber = 1; } else { - if(HPSTrackerBuilder.isHoleFromName(surveyVolume.getName())) { + if(HPSTrackerBuilder.isHoleFromName(surveyVolume)) { moduleNumber = 1; } else { moduleNumber = 3; @@ -75,10 +75,12 @@ } } - if(moduleNumber<0) throw new RuntimeException("Invalid module nr found for " + surveyVolume.getName()); + if(moduleNumber<0) throw new RuntimeException("Invalid module nr found for " + surveyVolume); return moduleNumber; } + + Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014ConverterBase.java ============================================================================= --- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014ConverterBase.java (original) +++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTracker2014ConverterBase.java Wed Dec 10 18:24:25 2014 @@ -270,7 +270,7 @@ * @param surveyVolume * @return module number */ - abstract protected int getModuleNumber(JavaSurveyVolume surveyVolume); + abstract protected int getModuleNumber(String surveyVolume); /** * Find the layer {@link DetectorElement}. @@ -323,7 +323,7 @@ if(layerDe==null) throw new RuntimeException("Cannot find layer DE"); //Find the module number - int moduleNumber = getModuleNumber(surveyVolume); + int moduleNumber = getModuleNumber(surveyVolume.getName()); //Find the module detector element IDetectorElement moduleDe = getModuleDetectorElement(layerDe, moduleNumber); @@ -357,7 +357,7 @@ // Create the sensor. HpsSiSensor sensor = createSiSensor(sensorNumber, sensorName, moduleDe, sensorPath, sensorId); - if(_debug) System.out.printf("%s: created sensor %s \n", getClass().getSimpleName(), sensor.getName()); + if(_debug) System.out.printf("%s: created sensor %s with id %d and expId %s \n", getClass().getSimpleName(), sensor.getName(), sensor.getIdentifier().getValue(), sensor.getExpandedIdentifier().toString()); } @@ -385,7 +385,7 @@ // create the "module" detector element // it's under the base element - int moduleNumber = getModuleNumber(surveyVolume); + int moduleNumber = getModuleNumber(surveyVolume.getName()); String modulePlacementName = surveyVolume.getName();// builder.getSubdetector().getName() + "_" + moduleName + "_layer" + layer + "_module" + moduleNumber; @@ -467,7 +467,7 @@ IExpandedIdentifier layerPosId = new ExpandedIdentifier(nfields); layerPosId.setValue(builder.getDetectorIdentifierHelper().getFieldIndex("system"), builder.getSubdetector().getSystemID()); layerPosId.setValue(builder.getDetectorIdentifierHelper().getFieldIndex("barrel"), builder.getDetectorIdentifierHelper().getBarrelValue()); - int layer = 12; // dummy value + int layer = 22; // dummy value layerPosId.setValue(builder.getDetectorIdentifierHelper().getFieldIndex("layer"), layer); IDetectorElement baseDe = builder.getBaseDetectorElement(); if(baseDe!=null) { ######################################################################## 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