3 modified files
lcsim/src/org/lcsim/contrib/RobKutschke/TKNHits
diff -u -r1.2 -r1.3
--- TrackerIdentifierIndexCache.java 6 Nov 2007 00:07:18 -0000 1.2
+++ TrackerIdentifierIndexCache.java 11 Dec 2007 07:28:38 -0000 1.3
@@ -5,7 +5,6 @@
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.identifier.IIdentifierDictionary;
-import org.lcsim.detector.identifier.IIdentifierDictionary.FieldNotFoundException;
import org.lcsim.geometry.compact.Subdetector;
@@ -18,10 +17,10 @@
* to find the index that corresponds to a quantity of interest. The return value will
* not change unless the detector changes.
* <p>
- *@author $Author: kutschke $
- *@version $Id: TrackerIdentifierIndexCache.java,v 1.2 2007/11/06 00:07:18 kutschke Exp $
+ *@author $Author: jeremy $
+ *@version $Id: TrackerIdentifierIndexCache.java,v 1.3 2007/12/11 07:28:38 jeremy Exp $
*
- * Date $Date: 2007/11/06 00:07:18 $
+ * Date $Date: 2007/12/11 07:28:38 $
*
*/
@@ -79,15 +78,15 @@
index = new int[field.length];
for ( int i=0; i<field.length; ++i ){
- try{
+ //try{
index[i] = dict.getFieldIndex(field[i]);
- }
- catch (FieldNotFoundException x){
- System.out.println ("Fatal error in TrackerIdentifierIndexCache. Could not find the field " + field[i]);
- System.out.println ("Known fields: " + dict.getFieldNameMap().keySet() );
- System.out.println ("Exiting now.");
- System.exit(-1);
- }
+ //}
+ //catch (FieldNotFoundException x){
+ //System.out.println ("Fatal error in TrackerIdentifierIndexCache. Could not find the field " + field[i]);
+ //System.out.println ("Known fields: " + dict.getFieldNameMap().keySet() );
+ //System.out.println ("Exiting now.");
+ //System.exit(-1);
+ // }
}
}
lcsim/src/org/lcsim/contrib/SiStripSim
diff -u -r1.6 -r1.7
--- StripClusterMaker.java 3 Dec 2007 23:30:10 -0000 1.6
+++ StripClusterMaker.java 11 Dec 2007 07:28:38 -0000 1.7
@@ -19,7 +19,6 @@
import org.lcsim.event.TrackerHit;
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.ExpandedIdentifier;
-import org.lcsim.detector.identifier.IIdentifierDictionary.FieldNotFoundException;
import java.util.List;
import java.util.ArrayList;
@@ -73,24 +72,10 @@
// Sort RawTrackerHits by electrodes
for (RawTrackerHit raw_hit : raw_hits)
{
- int strip_field;
- try
- {
- strip_field = raw_hit.getIdentifierHelper().getFieldIndex("strip");
- }
- catch (FieldNotFoundException exception)
- {
- throw new RuntimeException(exception);
- }
- int side_field;
- try
- {
- side_field = raw_hit.getIdentifierHelper().getFieldIndex("side");
- }
- catch (FieldNotFoundException exception)
- {
- throw new RuntimeException(exception);
- }
+ // FIXME: This doesn't need to be inside a loop if all the hits have
+ // the same helper.
+ int strip_field = raw_hit.getIdentifierHelper().getFieldIndex("strip");
+ int side_field = raw_hit.getIdentifierHelper().getFieldIndex("side");
// Get expanded ID
IExpandedIdentifier id = new ExpandedIdentifier(raw_hit.getExpandedIdentifier());
lcsim/src/org/lcsim/contrib/onoprien/tracking/geom
diff -u -r1.2 -r1.3
--- Navigator.java 8 Dec 2007 02:39:10 -0000 1.2
+++ Navigator.java 11 Dec 2007 07:28:38 -0000 1.3
@@ -11,7 +11,7 @@
* Utility class that contains helper methods for geometry navigation.
*
* @author D. Onoprienko
- * @version $Id: Navigator.java,v 1.2 2007/12/08 02:39:10 jeremy Exp $
+ * @version $Id: Navigator.java,v 1.3 2007/12/11 07:28:38 jeremy Exp $
*/
public final class Navigator {
@@ -40,9 +40,7 @@
public int getLayer(Sensor sensor) {
IDetectorElement de = sensor.getDetectorElement();
- try {
- return de.getIdentifierHelper().getValue(de.getIdentifier(), "layer");
- } catch (IIdentifierDictionary.FieldNotFoundException x) {throw new RuntimeException(x);}
+ return de.getIdentifierHelper().getValue(de.getIdentifier(), "layer");
}
public int getSuperLayer(Sensor sensor) {
CVSspam 0.2.8
