LISTSERV 16.5 - LCD-CVS Archives

+ + +jsource := $(wildcard src/java/hep/gear/api/*.java) +jsource += $(wildcard src/java/hep/gear/base/*.java) +jsource += $(wildcard src/java/hep/gear/implementation/*.java) +jsource += $(wildcard src/java/hep/gear/xml/*.java) + +cheaders := $(patsubst %.java, %.h, $(jsource) ) +cheaders := $(patsubst src/java/%, $(DIST)/include/%, $(cheaders) ) + +GEARBASESOURCES = $(cheaders) + + +

+ +$(DIST)/include/hep/gear/api/%.h: $(WORK)/jars/LCGO.jar + mkdir -p $(DIST)/include/hep/gear/api + gcjh --classpath=$< -d $(DIST)/include hep.gear.api.$* + +$(DIST)/include/hep/gear/implementation/%.h: $(WORK)/jars/LCGO.jar + mkdir -p $(DIST)/include/hep/gear/implementation + gcjh --classpath=$< -d $(DIST)/include hep.gear.implementation.$* + +$(DIST)/include/hep/gear/base/%.h: $(WORK)/jars/LCGO.jar + mkdir -p $(DIST)/include/hep/gear/base + gcjh --classpath=$< -d $(DIST)/include hep.gear.base.$* + +$(DIST)/include/hep/gear/xml/%.h: $(WORK)/jars/LCGO.jar + mkdir -p $(DIST)/include/hep/gear/xml + gcjh --classpath=$< -d $(DIST)/include hep.gear.xml.$* + + +$(WORK)/jars/LCGO.jar: src/java/hep/lcgo/xml/reader/*.java src/java/hep/lcgo/xml/reader/util/*.java src/java/hep/lcgo/util/cache/*.java $(jsource)

+ + +$(WORK)/includes: src/include/* $(DIST)/include/hep/lcgo/xml/reader/LCGOReader.h $(DIST)/include/hep/lcgo/xml/reader/Detector.h $(DIST)/include/hep/lcgo/xml/reader/Constant.h $(GEARBASESOURCES)

+ +#$(WORK)/includes: src/include/* $(DIST)/include/hep/lcgo/xml/reader/LCGOReader.h $(DIST)/include/hep/lcgo/xml/reader/Detector.h $(DIST)/include/hep/lcgo/xml/reader/Constant.h $(DIST)/include/hep/gear/base/Vector3D.h $(DIST)/include/hep/gear/base/Vector2D.h $(DIST)/include/hep/gear/base/Point3D.h $(DIST)/include/hep/gear/base/Point2D.h +# cp -r src/include/*.h $(DIST)/include +# touch $@ + +

+ <detector name="VXD" geartype="VXDParameters"> + <vxdType technology="CCD" /> + <shell halfLength="135.000000" gap="0.040000" innerRadius="65.000000" outerRadius="65.493920" radLength="352.759946" /> + <layers> + <layer nLadders="8" phi0="0.000000"> + <ladder distance="15.000000" thickness="0.282240" width="13.000000" length="25.000000" offset="-1.455005" radLength="352.759946" /> + <sensitive distance="15.282240" thickness="0.037440" width="13.000000" length="25.000000" offset="-1.455005" radLength="93.676203" /> + </layer> + <layer nLadders="8" phi0="0.000000"> + <ladder distance="26.000000" thickness="0.282240" width="22.000000" length="62.500000" offset="-1.398656" radLength="352.759946" /> + <sensitive distance="26.282240" thickness="0.037440" width="22.000000" length="62.500000" offset="-1.398656" radLength="93.676203" /> + </layer> + <layer nLadders="12" phi0="0.000000"> + <ladder distance="38.000000" thickness="0.282240" width="22.000000" length="62.500000" offset="-2.571633" radLength="352.759946" /> + <sensitive distance="38.282240" thickness="0.037440" width="22.000000" length="62.500000" offset="-2.571633" radLength="93.676203" /> + </layer> + <layer nLadders="16" phi0="0.000000"> + <ladder distance="49.000000" thickness="0.282240" width="22.000000" length="62.500000" offset="-3.592945" radLength="352.759946" /> + <sensitive distance="49.282240" thickness="0.037440" width="22.000000" length="62.500000" offset="-3.592945" radLength="93.676203" /> + </layer> + <layer nLadders="20" phi0="0.000000"> + <ladder distance="60.000000" thickness="0.282240" width="22.000000" length="62.500000" offset="-4.422448" radLength="352.759946" /> + <sensitive distance="60.282240" thickness="0.037440" width="22.000000" length="62.500000" offset="-4.422448" radLength="93.676203" /> + </layer> + </layers> + </detector> +

+ <parameter name="SomeIntParameter" type="int"> 21 </parameter> + <parameter name="SomeDoubleParameter" type="double"> 42.3 </parameter> + <parameter name="SomeStringParameter" type="string" value="42 " /> +

+ <detector id="0" name="SomeDetectorTest" geartype="GearParameters" type="UNKNOWN" insideTrackingVolume="false"> + + <parameter name="SomeIntParameter" type="int"> 21 </parameter> + <parameter name="AnotherIntParameter" type="int"> 42 </parameter> + <parameter name="SomeDoubleParameter" type="double"> 42.3 </parameter> + <parameter name="SomeStringParameter" type="string" value="42 " /> + + <parameter name="SomeIntParameters" type="IntVec"> 42 43 44 45 </parameter> + <parameter name="MoreIntParameters" type="IntVec"> 41 42 43 47 </parameter> + <parameter name="SomeDoubleParameters" type="DoubleVec"> 42.3 42.4 42.5 </parameter> + <parameter name="SomeStringParameters" type="StringVec" value="42 44 67 89 text number string 12345" /> + + </detector> + + + +

+ +#include <java/util/Map.h> +#include <java/lang/String.h> +#include <java/lang/Throwable.h> +#include <java/lang/System.h> + +#include "hep/gear/api/GearMgr.h" +#include "hep/gear/api/GearParameters.h" +#include "hep/gear/base/UnknownParameterException.h" +#include "hep/gear/implementation/GearParametersImpl.h" + +#include <cmath> + +using namespace hep::lcgo::xml::reader; +using namespace hep::gear::api ; +using namespace hep::gear::base ; +using namespace hep::gear::implementation ; +using namespace java::util; +using namespace java::lang; +using namespace std; + +// void lcgo_unexpected(){ +// try{ +// throw ; +// }catch( java::lang::Exception* e){ +// std::cout << " A runtime error has occured : " +// << e->toString() +// << std::endl +// << " the program will have to be terminated - sorry." << std::endl ; +// exit(1) ; +// } +// } + +typedef JArray< ::java::lang::String *> JStringArray ; + + +void testGearAPI( Detector* det ) ; +void printString( const std::string& cstring ) ;

+ + + // fg: can't mix C++ and Java exceptions in compilation unit + // --- unexpected and terminate don't work for Java Exceptions... +// std::set_unexpected( lcgo_unexpected ) ; +// std::set_terminate( lcgo_unexpected ) ; + + try{ +

+ + testGearAPI( det ) ; + + + + }catch( java::lang::Throwable* e){ + + std::cout << " An uncaught Exception has been found: " + << e->toString() + << std::endl + << " the program will have to be terminated - sorry." << std::endl ; + + std::cout << " ---- stack trace: ---------- " << std::endl ; +// e->printStackTrace( ::java::lang::System::out ) ; +// e->fillInStackTrace() ; +// e->printStackTrace() ; + exit(1) ; + } + + +} + + +void testGearAPI( Detector* det ) { + + // print user defined parameters: + GearMgr* gearmgr = det->gearMgr() ; + + + JStringArray* keys = gearmgr->getGearParameterKeys(); + + for(int i=0 ; i < keys->length ; i++){ + + // access to java arrays works only through elements !!?? + String* s = elements(keys)[i] ; + + GearParameters* p = gearmgr->getGearParameters( s ) ; + + cout << " found gear parameters for detector : " << s << endl ; + cout << p->toString() + << endl ; + + + + // try accessing an array of ints: + + // -------------------- can't use c'tor of String with const char * !!?? + try{ + // jintArray jia = p->getIntVals( JvNewStringLatin1("SomeIntParameters") ) ; + // ----- optionally create a wrapper conversion class object + jintArray jia = p->getIntVals( cjstring("SomeIntParameters") ) ; + + cout << " test: SomeIntParameters [" + << int(jia->length) << "] { " ; + + for(int i=0 ; i< jia->length ; i++){ + + // ------ need cast to int for printout !!?? ------ + cout << (int) elements(jia)[i] << ", " ; + if( elements(jia)[i] == 42 ) continue ; + + } + cout << " } " << endl ; + }catch( UnknownParameterException* e){ + // parameter wasn't set + } + + + // try accessing an array of doubles: + + // -------------------- can't use c'tor of String with const char * !!?? + try { + + jdoubleArray jda = p->getDoubleVals( JvNewStringLatin1("SomeDoubleParameters") ) ; + + cout << " test: SomeDoubleParameters [" + << int(jda->length) << "] { " ; + + for(int i=0 ; i< jda->length ; i++){ + + // ------ need cast or temporary double for function calls !!?? ------ + double val( elements(jda)[i] ) ; + cout << std::sin( val ) << ", " ; + + } + cout << " } " << endl ; + + }catch( UnknownParameterException* e){ + // parameter wasn't set + } + + + + // accessing basic type parameters: +// int values: {SomeIntParameter=21} +// double values: {SomeDoubleParameter=42.3} +// string values: {SomeStringParameter=42 } + + try{ + int ival = p->getIntVal( JvNewStringLatin1("SomeIntParameter") ) ; + std::cout << " - found int SomeIntParameter : " << ival << std::endl ; + double dval = p->getDoubleVal( JvNewStringLatin1("SomeDoubleParameter") ) ; + std::cout << " - found double SomeDoubleParameter : " << dval << std::endl ; + +// String* sval = p->getStringVal( JvNewStringLatin1("SomeStringParameter") ) ; +// std::cout << " - found double SomeStringParameter : " ; +// printString( cjstring(sval) ) ; +// std::cout << std::endl ; + + cjstring sval = p->getStringVal( cjstring("SomeStringParameter") ) ; + std::cout << " - found double SomeStringParameter : " + << sval << std::endl ; + + + + }catch( UnknownParameterException* e){ + // parameter wasn't set + } + + + // ----- try to modify/extend the GearParameters------------ + if( p->toString()->length() > 0 ) { + // ----- gjjh does not create inheritance for interfaces !!?? + // ------ use ugly reinterpret_cast - is this dangerous ?? + // GearParametersImpl* pImpl = reinterpret_cast<GearParametersImpl*>(p) ; + // ------ use old c-style / Java style cast !!?? + // ----- this needs to be studied and understood !! + GearParametersImpl* pImpl = (GearParametersImpl*) p ; + + +// jintArray newInts = JvNewIntArray( 3 ) ; +// // ------ cannot assign to java array variables with operator [] !!?? +// newInts[0] = 1234 ; +// newInts[1] = 12345 ; +// newInts[2] = 123456 ; + +// pImpl->setIntVals( JvNewStringLatin1("SomeCoolNewIntvals") , newInts ) ; + +// jint* newIntsC = elements ( newInts ) ; + + + cjarray<int,jint> newIntsC( 3 ) ; + newIntsC[0] = 1234 ; + newIntsC[1] = 12345 ; + newIntsC[2] = 123456 ; + pImpl->setIntVals( JvNewStringLatin1("SomeCoolNewIntvals") , newIntsC.j_ar() ) ; + + + // test iterator + std::vector<int> stdv ; + std::copy( newIntsC.begin() , newIntsC.end() , std::back_inserter( stdv ) ) ; + + // --- now modify existing parameters + try{ + jintArray jia = p->getIntVals( JvNewStringLatin1("SomeIntParameters") ) ; + + for(int i=0 ; i< jia->length ; i++){ + elements(jia)[i] += 100000 ; + } + + + // modified parameters: + cout << " modified gear parameters for detector : " << s << endl ; + cout << p << endl ; + + GearIntVec iv( jia ) ; + std::cout << " GearIntVec iv: " << iv << std::endl ; + std::cout << " jintarray: " << jia << std::endl ; + std::cout << " cjarray: " << cjarray<int,jint>(jia) << std::endl ; + + }catch( UnknownParameterException* e){ + // parameter wasn't set + } + + } + } + + // try instantiating a java object on the heap : + // GearParametersImpl someParams() ; +

+ // initialize classes : - is this needed ? (not according to the gcj manual ) + JvInitClass(& hep::gear::api::GearParameters::class$); + JvInitClass(& hep::gear::api::GearMgr::class$); + JvInitClass(& hep::gear::implementation::GearParametersImpl::class$); + JvInitClass(& java::lang::System::class$); + + +

+ +/** Conversion of jintArray to std::vector<int> */ +class GearIntVec : public std::vector<int>{ + + public: + + GearIntVec( unsigned length ) : std::vector<int>( length) {} + + GearIntVec(const jintArray jia ) : std::vector<int>( jia->length ) { + + // assert( sizeof( int ) == sizeof( jint ) ) ; + std::copy( elements(jia) , elements(jia)+jia->length , begin() ) ; + } +}; +template <class C, class J > +class cjarray ; + +template <class C, class J > +std::ostream& operator << (std::ostream& os, const cjarray< C, J >& a) { + os << " { " ; + for( int i=0 ; i< a.size() ; ++i){ + os << a[i] << " , " ; + } + os << "} " << std::endl ; + +} + +/** Convenient access to JArray<> elements from c++ */ +template <class C, class J > +class cjarray { + +protected: + JArray<J>* _ja ; + +public: + cjarray( JArray<J>* ja ) : _ja(ja) {} + cjarray( unsigned n) : _ja( JvNewIntArray(n) ) {} + + size_t size() const { return _ja->length ;} + C operator[](unsigned i) const { return elements(_ja)[i] ; } + J& operator[](unsigned i) { return elements(_ja)[i] ; } + + JArray<J>* j_ar() { return _ja ; } + + C* begin() { return (C*) elements(_ja) ; } + C* end() { return (C*) elements(_ja)+_ja->length ; } + +} ; + +std::ostream& operator << (std::ostream& os, const GearIntVec& v) ; + +// inline +// java::lang::String* c2j( const char* t) { return JvNewStringLatin1(t) ; } + + +/** Conversion between jstring (java::lang::String*) and std::string/const char* */ +class cjstring { + + private: + std::string _text ; + + public: + cjstring( const std::string& str ) : _text( str ) {} ; + + cjstring( const char* text) : _text( text ) {} ; + + cjstring( jstring jstr ) { + + int l = JvGetStringUTFLength(jstr); + char* t = new char[l+1]; + + JvGetStringUTFRegion(jstr,0,l,t); + *(t+l)='\0'; + _text = t ; + + delete[] t ; + } ; + + /** Conversion to java string - creates new object on the (java) heap */ + operator jstring() { + return JvNewStringLatin1(_text.c_str() ) ; + } + + /** Conversion to c++ string for function calls */ + operator const std::string&() { return _text ; } + + /** Provide access to the c++ string */ + std::string& str() { return _text ; } + + /** Provide access to the c string - same as str().c_str() */ + const char* c_str() { return _text.c_str() ; } +}; + + +

LCGO/src/java/hep/lcgo/xml/reader

LCGOReader.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- LCGOReader.java	29 Sep 2006 16:27:18 -0000	1.1
+++ LCGOReader.java	30 Oct 2006 10:52:21 -0000	1.2
@@ -11,6 +11,12 @@

 import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.jdom.input.SAXBuilder;

+
+import hep.gear.api.GearMgr;
+import hep.gear.api.GearParameters;
+import hep.gear.base.UnknownParameterException;
+import hep.gear.xml.GearXMLParameters;
+import hep.gear.xml.VXDParametersXML;

 import hep.lcgo.xml.reader.util.CachingEntityResolver;
 import hep.lcgo.xml.reader.util.ElementFactory;
 import hep.lcgo.xml.reader.util.JDOMExpressionFactory;

@@ -24,94 +30,137 @@

  * org.lcsim.geometry.GeometryReader class, which extends this.
  *
  * @author tonyj

- * @version $Id: LCGOReader.java,v 1.1 2006/09/29 16:27:18 tonyj Exp $

+ * @version $Id: LCGOReader.java,v 1.2 2006/10/30 10:52:21 gaede Exp $

  *
  */
 public class LCGOReader
 {

-    private ElementFactory factory;
-    
-    /**
-     * Create a CompactReader using a DefaultElementFactory.
-     */
-    public LCGOReader()
-    {
-        this(new LCGOElementFactory());
-    }
-    /**
-     * Create a CompactReader using the specified ElementFactory.
-     * @param factory The ElementFactory to be used for creating elements as the file is parsed.
-     */
-    public LCGOReader(ElementFactory factory)
-    {
-        this.factory = factory;
-    }
-    
-    public Detector read(String fileName) throws IOException, JDOMException, ElementCreationException
-    {
-        InputStream in = new FileInputStream(fileName);
-        try
-        {
-            return read(in);
-        }
-        finally
-        {
-            in.close();
-        }  
-    }
-    /**
-     * Read a compact geometry XML file.
-     * @param in The input stream to read.
-     * @throws java.io.IOException If an IO error occurs while reading the stream.
-     * @throws org.jdom.JDOMException If invalid XML is found while reading the file.
-     * @throws org.lcsim.geometry.compact.ElementFactory.ElementCreationException If the ElementFactory throws an ElementCreationException.
-     * @return The parsed detector description.
-     */
-    public Detector read(InputStream in) throws IOException, JDOMException, ElementCreationException
-    {
-        JDOMExpressionFactory jdom = new JDOMExpressionFactory();
-        SAXBuilder builder = new SAXBuilder("org.apache.xerces.parsers.SAXParser");
-        builder.setFactory(jdom);        
-        
-        builder.setValidation(true);
-        builder.setFeature("http://apache.org/xml/features/validation/schema", true);
-        
-        // Add an EntityResolver that caches to ~/.cache
-        builder.setEntityResolver(new CachingEntityResolver());
-       
-        Document doc = builder.build(in);
-        
-        Element lccdd = doc.getRootElement();
-        Detector det = (Detector) factory.createElement(Detector.class,lccdd,null);
-        
-        readHeader(lccdd, det, jdom);       
-        return det;
-    }
-    
-    private void readHeader(Element lccdd, Detector det, JDOMExpressionFactory jdom) throws JDOMException, ElementCreationException
-    {
-        Element info = lccdd.getChild("info");
-        det.setHeader((Header) factory.createElement(Header.class,info,null));
-        Element define = lccdd.getChild("define");
-        for (Iterator i = define.getChildren("constant").iterator(); i.hasNext(); )
-        {
-            Element constant = (Element) i.next();
-            Constant c = (Constant) factory.createElement(Constant.class,constant,null);
-            jdom.addConstant(c.getName(),c.getValue());
-            det.addConstant(c);
-        }
-    }
-    // Fixme: Should not be here
-    public static void main(String[] args) throws FileNotFoundException, IOException, JDOMException, ElementCreationException
-    {
-       LCGOReader reader = new LCGOReader();
-       Detector det = reader.read(new FileInputStream(args[0]));
-       Map constants = det.getConstants();
-       for (Iterator i = constants.entrySet().iterator(); i.hasNext(); )
-       {
-          Map.Entry entry = (Map.Entry) i.next();
-          Constant c = (Constant) entry.getValue();
-          System.out.println(entry.getKey()+"="+c.getValue());
-       }
-    }
-}

+	private ElementFactory factory;
+
+	/**
+	 * Create a CompactReader using a DefaultElementFactory.
+	 */
+	public LCGOReader()
+	{
+		this(new LCGOElementFactory());
+	}
+	/**
+	 * Create a CompactReader using the specified ElementFactory.
+	 * @param factory The ElementFactory to be used for creating elements as the file is parsed.
+	 */
+	public LCGOReader(ElementFactory factory)
+	{
+		this.factory = factory;
+	}
+
+	public Detector read(String fileName) throws IOException, JDOMException, ElementCreationException
+	{
+		InputStream in = new FileInputStream(fileName);
+		try
+		{
+			return read(in);
+		}
+		finally
+		{
+			in.close();
+		}  
+	}
+	/**
+	 * Read a compact geometry XML file.
+	 * @param in The input stream to read.
+	 * @throws java.io.IOException If an IO error occurs while reading the stream.
+	 * @throws org.jdom.JDOMException If invalid XML is found while reading the file.
+	 * @throws org.lcsim.geometry.compact.ElementFactory.ElementCreationException If the ElementFactory throws an ElementCreationException.
+	 * @return The parsed detector description.
+	 */
+	public Detector read(InputStream in) throws IOException, JDOMException, ElementCreationException
+	{
+		JDOMExpressionFactory jdom = new JDOMExpressionFactory();
+		SAXBuilder builder = new SAXBuilder("org.apache.xerces.parsers.SAXParser");
+		builder.setFactory(jdom);        
+
+		//builder.setValidation(true);
+		//builder.setFeature("http://apache.org/xml/features/validation/schema", true);
+
+		// Add an EntityResolver that caches to ~/.cache
+		builder.setEntityResolver(new CachingEntityResolver());
+
+		Document doc = builder.build(in);
+
+		Element lccdd = doc.getRootElement();
+		Detector det = (Detector) factory.createElement(Detector.class,lccdd,null);
+
+		readHeader(lccdd, det, jdom);
+		readSubdetectors( lccdd, det ) ;
+		return det;
+	}
+
+	private void readHeader(Element lccdd, Detector det, JDOMExpressionFactory jdom) throws JDOMException, ElementCreationException
+	{
+		Element info = lccdd.getChild("info");
+		det.setHeader((Header) factory.createElement(Header.class,info,null));
+		Element define = lccdd.getChild("define");
+		for (Iterator i = define.getChildren("constant").iterator(); i.hasNext(); )
+		{
+			Element constant = (Element) i.next();
+			Constant c = (Constant) factory.createElement(Constant.class,constant,null);
+			jdom.addConstant(c.getName(),c.getValue());
+			det.addConstant(c);
+		}
+	}
+
+	private void readSubdetectors( Element lccdd, Detector det)throws JDOMException, ElementCreationException{
+		Element detectors = lccdd.getChild("detectors") ;
+		for (Iterator i = detectors.getChildren("detector").iterator(); i.hasNext(); )
+		{
+			Element subdet = (Element) i.next();
+			String subdetName = subdet.getAttributeValue("name") ;
+			System.out.println(" --- LCGOReader : parsing subdetector: " + subdetName ) ;
+
+			String geartype = subdet.getAttributeValue("geartype") ;
+			if(geartype==null)
+				geartype = "UNKNWON" ;
+
+//			FIXME: introduce common base for xml handler and use map to get appropriate handler	
+			if( geartype.compareTo("VXDParameters") == 0 ){
+				VXDParametersXML vxdXML = (VXDParametersXML) factory.createElement(VXDParametersXML.class,subdet,null);
+				det.gearMgr().setVXDParameters( vxdXML.getVXDParameters() ) ;
+			} else {
+				// ---- first we read user defined generic parameters for every subdetector
+				GearXMLParameters p = (GearXMLParameters) factory.createElement(GearXMLParameters.class,subdet,null);
+				det.gearMgr().setGearParameters( subdetName , p.parameters() ) ;
+
+				System.out.print(  p.parameters().toString() ) ;
+			}
+			//            jdom.addConstant(c.getName(),c.getValue());
+//			det.addConstant(c);
+		}
+
+	}
+
+
+	// Fixme: Should not be here
+	public static void main(String[] args) throws FileNotFoundException, IOException, JDOMException, ElementCreationException
+	{
+		LCGOReader reader = new LCGOReader();
+		Detector det = reader.read(new FileInputStream(args[0]));
+		Map constants = det.getConstants();
+		for (Iterator i = constants.entrySet().iterator(); i.hasNext(); )
+		{
+			Map.Entry entry = (Map.Entry) i.next();
+			Constant c = (Constant) entry.getValue();
+			System.out.println(entry.getKey()+"="+c.getValue());
+		}
+		GearMgr gm = det.gearMgr() ;
+		String[] keys = gm.getGearParameterKeys() ;
+		for (int i = 0; i < keys.length; i++) {
+			GearParameters p = gm.getGearParameters(keys[i])  ;
+			try{
+				System.out.println( " ----- SomeIntVal : " + p.getIntVal("SomeIntVal") ) ; 
+			}catch( UnknownParameterException e){
+			}
+
+		}
+
+	}
+}

\ No newline at end of file

Commit in `LCGO` on MAIN
`GNUmakefile`	+58	-8	1.2 -> 1.3
`GeometryReaderTest.xml`	+51	-3	1.1 -> 1.2
`test.cc`	+233	-4	1.1 -> 1.2
`src/cpp/LCGO.cc`	+13		1.1 -> 1.2
`/LCGOUtil.cc`	+10		1.1 -> 1.2
`src/include/LCGO.h`	+4		1.1 -> 1.2
`/LCGOUtil.h`	+102		1.1 -> 1.2
`src/java/hep/lcgo/xml/reader/Detector.java`	+10	-1	1.1 -> 1.2
`/LCGOElementFactory.java`	+5	-1	1.1 -> 1.2
`/LCGOReader.java`	+136	-87	1.1 -> 1.2
	+622	-104