Print

Print


Author: [log in to unmask]
Date: Wed Mar 25 20:10:41 2015
New Revision: 3576

Log:
Add support for downloading and caching a fieldmap file from a URL.
LCDD maintains its original format.

Modified:
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/FieldMap3D.java   (contents, props changed)

Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/FieldMap3D.java
 =============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/FieldMap3D.java	(original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/FieldMap3D.java	Wed Mar 25 20:10:41 2015
@@ -1,5 +1,7 @@
 package org.lcsim.geometry.compact.converter.lcdd;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.lcsim.geometry.compact.converter.lcdd.util.LCDD;
@@ -18,6 +20,13 @@
 	{
 		double xoffset, yoffset, zoffset;
 		xoffset = yoffset = zoffset = 0;
+                String filename = node.getAttribute("filename").getValue();
+                String file=filename;
+                if(filename.startsWith("http"))
+                {
+                   int index = filename.lastIndexOf("/");
+                   file = "fieldmap/"+filename.substring(index + 1);
+                }
 		if (node.getAttribute("xoffset") != null)
 			xoffset = node.getAttribute("xoffset").getDoubleValue();
 		if (node.getAttribute("yoffset") != null)
@@ -27,7 +36,8 @@
 		org.lcsim.geometry.compact.converter.lcdd.util.FieldMap3D fieldMap = 
 				new org.lcsim.geometry.compact.converter.lcdd.util.FieldMap3D(
 						node.getAttribute("name").getValue(),
-						node.getAttribute("filename").getValue(),
+//						node.getAttribute("filename").getValue(),
+                                                file,
 						xoffset,
 						yoffset,
 						zoffset);

########################################################################
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