Commit in lcsim/test/org/lcsim/conditions on MAIN
ConditionsManagerTest.java+105-571.9 -> 1.10
JM: More complete test of detector conditions.

lcsim/test/org/lcsim/conditions
ConditionsManagerTest.java 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- ConditionsManagerTest.java	22 May 2006 19:55:09 -0000	1.9
+++ ConditionsManagerTest.java	19 Sep 2006 18:39:12 -0000	1.10
@@ -17,13 +17,14 @@
 
 /**
  *
+ * Test a detector for standard conditions files.
+ *
  * @author jeremym
  */
 public class ConditionsManagerTest extends TestCase
 {
-    private ConditionsManager _mgr;
-    public List<String> testDets;
-    public final static String[] condNames =  {"TrackParameters","ClusterParameters", "SamplingFractions/EMBarrel"/*,"HitSmearing","SamplingFractions"*/};
+    private ConditionsManager mgr;
+    public List<String> testDets = new ArrayList<String>();
     
     /** Creates a new instance of ConditionsReaderTest */
     public ConditionsManagerTest(String testName)
@@ -38,78 +39,125 @@
     
     protected void setUp() throws Exception
     {
-        _mgr = ConditionsManager.defaultInstance();
+        mgr = ConditionsManager.defaultInstance();
         
-        FileCache cache = new FileCache();
-        File file = cache.getCachedFile(new URL("http://lcsim.org/detectors/taglist.txt"));
-        BufferedReader reader = new BufferedReader(new FileReader(file));
-        testDets = new ArrayList<String>();
-        for (;;)
-        {
-            String line = reader.readLine();
-            if (line == null) break;
-                 
-            /* Only check the sidaug05 detectors that should have conditions. --JM */
-            if ( line.contains("sidaug05") && 
-                    !line.contains("_polyhedra") && 
-                    !line.contains("_gemhcal") )
-            {
-                testDets.add(line.trim());
-            }
-        }
-        reader.close();
+        testDets.add("sdjan03");        
     }
     
     public void test_files() throws Exception
     {
         for (String detName : testDets )
         {
-            _mgr.setDetector(detName,0);
+            mgr.setDetector(detName,0);
             
-            // First check we have a compact description
+            // First check we have a compact description            
+            RawConditions conditions = mgr.getRawConditions("compact.xml");
             
-            RawConditions conditions = _mgr.getRawConditions("compact.xml");
+            // Read the detector.
             InputStream in = conditions.getInputStream();
             GeometryReader reader = new GeometryReader();
             Detector detector = (Detector) reader.read(in);
-            
-            for ( String s : condNames )
+           
+            //System.out.println("checking conditions for detector="+detector.getName());
+                
+            // Check raw conditions.                
+            RawConditions rawconditions = mgr.getRawConditions("ClusterParameters.properties");
+            rawconditions = mgr.getRawConditions("detector.properties");
+            rawconditions = mgr.getRawConditions("HitSmearing.properties");
+            rawconditions = mgr.getRawConditions("IDEfficiency.properties");
+            rawconditions = mgr.getRawConditions("SimpleTrack.properties");
+            rawconditions = mgr.getRawConditions("TrackParameters.properties");
+            rawconditions = mgr.getRawConditions("digisim/digisim.steer");
+            rawconditions = mgr.getRawConditions("TrackParameters/FullBarrelResolutionBc.ini");
+            rawconditions = mgr.getRawConditions("TrackParameters/FullBarrelResolutionNbc.ini");
+            rawconditions = mgr.getRawConditions("SamplingFractions/EMBarrel.properties");
+            rawconditions = mgr.getRawConditions("SamplingFractions/EMEndcap.properties");
+            rawconditions = mgr.getRawConditions("SamplingFractions/HADBarrel.properties");
+            rawconditions = mgr.getRawConditions("SamplingFractions/HADEndcap.properties");
+            rawconditions = mgr.getRawConditions("SamplingFractions/LumEndcap.properties");
+            rawconditions = mgr.getRawConditions("SamplingFractions/MuonBarrel.properties");
+            rawconditions = mgr.getRawConditions("SamplingFractions/MuonEndcap.properties");  
+                
+            // Check conditions created by converters.
+            ConditionsSet conditionset = mgr.getConditions("SamplingFractions/EMBarrel");
+            conditionset = mgr.getConditions("SamplingFractions/EMEndcap");
+            conditionset = mgr.getConditions("SamplingFractions/HADBarrel");
+            conditionset = mgr.getConditions("SamplingFractions/HADEndcap");
+            conditionset = mgr.getConditions("SamplingFractions/LumEndcap");
+            conditionset = mgr.getConditions("SamplingFractions/MuonBarrel");
+            conditionset = mgr.getConditions("SamplingFractions/MuonEndcap");
+            conditionset = mgr.getConditions("ClusterParameters");
+            conditionset = mgr.getConditions("detector");
+            conditionset = mgr.getConditions("HitSmearing");
+            conditionset = mgr.getConditions("IDEfficiency");
+            conditionset = mgr.getConditions("SimpleTrack");
+            conditionset = mgr.getConditions("TrackParameters");                                                
+        }
+    }
+}
+
+/*
+for ( String s : condNames )
+{
+    try
+    {
+        ConditionsSet cs = mgr.getConditions(s);
+        if ( cs == null )
+        {
+            //throw new RuntimeException("ConditionSet not found: " + s);
+            System.out.println("conditionset not found: " + s);
+        }
+        else
+        {
+            for ( Object o : cs.keySet() )
             {
-                try
+                String k = o.toString();
+            
+                Class typ = cs.getType(k);
+                if ( typ == double.class )
                 {
-                    ConditionsSet cs = _mgr.getConditions(s);
-                    if ( cs == null )
-                    {
-                        throw new RuntimeException("ConditionSet not found: " + s);
-                    }
-                    else
-                    {
-                        for ( Object o : cs.keySet() )
-                        {
-                            String k = o.toString();
-                            
-                            Class typ = cs.getType(k);
-                            if ( typ == double.class )
-                            {
-                                double dblVal = cs.getDouble(k);
-                            }
-                            if ( typ == int.class )
-                            {
-                                int intVal = cs.getInt(k);
-                            }
-                            else if ( typ == java.lang.String.class )
-                            {
-                                String strVal = cs.getString(k);
-                            }
-                            
-                        }
-                    }
+                    double dblVal = cs.getDouble(k);
                 }
-                catch (IllegalArgumentException iae)
+                if ( typ == int.class )
                 {
-                    throw new RuntimeException("Bad key to ConditionsSet.getX() function.", iae);
+                    int intVal = cs.getInt(k);
+                }
+                else if ( typ == java.lang.String.class )
+                {
+                    String strVal = cs.getString(k);
                 }
             }
         }
     }
+    catch (Exception e)
+    {
+        System.out.println("conditionset not found: " + s);
+    }
+    //catch (IllegalArgumentException iae)
+    //{
+    //    throw new RuntimeException("Bad key to ConditionsSet.getX() function.", iae);
+    //}
 }
+*/
+
+//FileCache cache = new FileCache();
+//File file = cache.getCachedFile(new URL("http://lcsim.org/detectors/taglist_test.txt"));
+//BufferedReader reader = new BufferedReader(new FileReader(file));
+//testDets = new ArrayList<String>();
+//for (;;)
+//{
+//    String line = reader.readLine();
+//    if (line == null) break;
+         
+/* Only check the sidaug05 detectors that should have conditions. --JM */
+//if ( line.contains("sidaug05") && 
+//        !line.contains("_polyhedra") && 
+//        !line.contains("_gemhcal") )
+//{
+//testDets.add(line.trim());
+//}
+//}
+//reader.close();
+
+//public final static String[] condNames =  
+//    {"SamplingFractions/EMBarrel", "TrackParameters.properties"};
CVSspam 0.2.8