Changeset 625

Timestamp:

09/18/08 11:18:52 (2 months ago)

Author:

laidler

Message:

Added handling of the subset flag; also added more duplicate-related bookkeeping

Files:

• trunk/pysynphot/test/commissioning/basecase.py (modified) (1 diff)
• trunk/pysynphot/test/commissioning/gencases.py (modified) (4 diffs)

trunk/pysynphot/test/commissioning/basecase.py

@@ -50 +50 @@
-                  'SigThresh':self.sigthresh,
-                  'SkyLines':self.hasSkyLines()}
+        try:
+            self.tda['Subset']=self.subset
+        except AttributeError:
+            pass
-        self.tra={}
-

trunk/pysynphot/test/commissioning/gencases.py

@@ -2 +2 @@
-import sys,os
-
-
+,subsetfile=None
-    """ Generate TestCases from cmdfile according to the pattern in patternfile"""
+    #Define the test case pattern
-    pattern="""class %sCase%d(basecase.%sCase):
-    def setUp(self):
-        self.obsmode="%s"
-        self.spectrum="%s"
+        self.subset=%s
-        self.setglobal(__file__)
-        self.runpy()\n"""
+
+    #Process the subsetfile if present
+    subsetflag={}
+    if subsetfile is not None:
+        #Then this file contains a list of case names that should have a
+        #subset flag set.
+        f=open(subsetfile)
+        for line in f:
+            if not line.startswith('#') and len(line.strip())>0:
+                cols=line.strip().split()
+                subsetflag[cols[0]]=True
+        f.close()
+
+    #Open the main input and output files
-    f=open(cmdfile)
-    out=open(cmdfile.replace('.txt','.py'),'w')
@@ -17 +33 @@
-""")
-
-
+
-    count={'countrate':0,'calcspec':0,'calcphot':0,'SpecSourcerateSpec':0,'thermback':0}
-    dupcatcher={}
-    dupcounter={'countrate':0,'calcspec':0,'calcphot':0,'SpecSourcerateSpec':0,'thermback':0}
+
+    #Now start the main loop
-    for line in f:
-    
@@ -41 +59 @@
-        except KeyError:
-            kwd['spectrum']=None
-
-
+
+
+
-        ktuple=(cmd,obsmode,kwd['spectrum'])
+        
+
-        
-        if ktuple in dupcatcher:
-           dupcounter[cmd]+=1
+           dupcatcher[ktuple].append(casename)
-        else:
-casename="%sCase%d"%(cmd,count[cmd])
-upcatcher[ktuple]=casename
+dupcatcher[ktuple]=[casename]
+efn=pattern%(cmd,count[cmd],cmd,obsmode,kwd['spectrum'],subsetflag.get(casename,False))
-           out.write(defn)
-
@@ -64 +86 @@
-
-    for k in count:
-
+#
-        sys.stdout.write(total)
-        out.write(total)
-    out.close()
+    return dupcatcher
-
-if __name__ == '__main__':
-run(sys.argv[1
+dups = run(*sys.argv[1: