Changeset 622

Show
Ignore:
Timestamp:
09/17/08 16:24:19 (2 months ago)
Author:
laidler
Message:

Automatically exclude duplicates (without changing any casenames)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/pysynphot/test/commissioning/gencases.py

    r569 r622  
    1919 
    2020    count={'countrate':0,'calcspec':0,'calcphot':0,'SpecSourcerateSpec':0,'thermback':0} 
     21    dupcatcher={} 
     22    dupcounter={'countrate':0,'calcspec':0,'calcphot':0,'SpecSourcerateSpec':0,'thermback':0} 
    2123    for line in f: 
    2224     
     
    4143             
    4244        defn=pattern%(cmd,count[cmd],cmd,obsmode,kwd['spectrum']) 
    43         out.write(defn) 
     45        ktuple=(cmd,obsmode,kwd['spectrum']) 
     46         
     47        if ktuple in dupcatcher: 
     48           dupcounter[cmd]+=1 
     49        else: 
     50           casename="%sCase%d"%(cmd,count[cmd]) 
     51           dupcatcher[ktuple]=casename 
     52           out.write(defn) 
    4453 
    4554 
     
    5564 
    5665    for k in count: 
    57         print "%s:%d"%(k,count[k]) 
    58         out.write("# %s:%d\n"%(k,count[k])) 
     66        total= "%s:%d-%d=%d\n"%(k,count[k],dupcounter[k],count[k]-dupcounter[k]) 
     67        sys.stdout.write(total) 
     68        out.write(total) 
    5969    out.close() 
    6070