lcsim/src/org/lcsim/recon/vertexing/pixsim
diff -u -r1.3 -r1.4
--- CarrierPropagator.java 29 Dec 2010 22:29:37 -0000 1.3
+++ CarrierPropagator.java 24 Feb 2011 20:53:59 -0000 1.4
@@ -328,22 +328,31 @@
public boolean useTable(String nam, String dname)
{
- use_table = false;
+ // Replaced reading of detector conditions with lcsim resource files. --JM
+ /*
String dfname = "/detectors/"+dname+".zip";
String enam = "PixilatedSensorTables/"+nam;
- ConditionsManager cm = ConditionsManagerImplementation.defaultInstance();
+ ConditionsManager cm = ConditionsManagerImplementation.defaultInstance();
try {cm.setDetector(dname, 0); }
catch(Exception e) {
throw new RuntimeException("Could not find conditions information for detector "+dname);
- }
- BufferedReader reader;
+ }
try {
InputStream is = cm.getRawConditions(enam).getInputStream();
+ */
+ use_table = false;
+ BufferedReader reader;
+ System.out.println(this.getClass().getSimpleName() + " looking for resource " + nam);
+ InputStream is = this.getClass().getResourceAsStream(nam);
+ if (is != null)
+ System.out.println(this.getClass().getSimpleName() + " found resource " + nam);
+ else
+ throw new RuntimeException(this.getClass().getSimpleName() + " did not find resource " + nam);
reader = new BufferedReader(new InputStreamReader(is));
- System.out.println("Found table "+enam+" in detector "+dname+" conditions");
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage());
- }
+ //System.out.println("Found table "+enam+" in detector "+dname+" conditions");
+ // } catch (Exception e) {
+ //throw new RuntimeException(e.getMessage());
+ //}
if(reader != null) use_table = readTable(reader);
return use_table;
}
lcsim/src/org/lcsim/recon/vertexing/pixsim
diff -u -r1.2 -r1.3
--- ErrorEstimate.java 29 Dec 2010 22:29:37 -0000 1.2
+++ ErrorEstimate.java 24 Feb 2011 20:53:59 -0000 1.3
@@ -103,6 +103,7 @@
public boolean readTable(String nam, Detector det)
{
+ /*
String dname = det.getName();
tab_read = false;
ConditionsManager cm = ConditionsManagerImplementation.defaultInstance();
@@ -115,13 +116,27 @@
BufferedReader reader;
try {
InputStream is = cm.getRawConditions(enam).getInputStream();
+ */
+ tab_read = false;
+ BufferedReader reader;
+ System.out.println(this.getClass().getSimpleName() + " looking for resource " + nam);
+ InputStream is = this.getClass().getResourceAsStream(nam);
+ if (is != null)
+ System.out.println(this.getClass().getSimpleName() + " found resource " + nam);
+ else
+ throw new RuntimeException(this.getClass().getSimpleName() +" did not find resource " + nam);
+ reader = new BufferedReader(new InputStreamReader(is));
+
+ /*
reader = new BufferedReader(new InputStreamReader(is));
+
System.out.println("Found table "+enam+" in detector "+dname+" conditions");
}
catch (Exception e)
{
throw new RuntimeException(e.getMessage());
}
+ */
if(reader != null) tab_read = readTable(reader);
return tab_read;
}