Ignore:
Timestamp:
Jul 3, 2018 2:30:41 PM (4 years ago)
Author:
srkline
Message:

Many changes:

Made the VCALC panel aware of all of the binning options
Corrected the behavior of the VCALC preset conditions
Adjusted how the Slit data is binned so that there are not duplicated q-values in the output

Made Absolute scaling aware of the back detector. Now the ABS String in the protocol has a second
set of scaling constants tagged with "_B" for the back detector. There is an added button
on the protocol panel to set the second set of constants. For the back detector, the read noise
is subtracted by reading it from the empty beam file (shifting over to the right by one box width)
All of the associated abs procedures are now aware of this.
More error checking needs to be added.

Back detector image is now shifted upon loading of the data. the default mask takes this into account
and masks out the padded (zero) regions.

in the protocol, DIV and MSK do not use grep any longer. it was just way too slow. Now it depends on

the file name having DIV or MASK respectively.



Raw data files can now be added together, in the usual way from the protocol panel.



File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_Write.ipf

    r1106 r1109  
    216216//      endif 
    217217        return(err) 
     218End 
     219 
     220// fname is a local WORK folder 
     221Function V_putCollectionTime(fname,val) 
     222        String fname 
     223        Variable val 
     224 
     225//root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FB:beam_center_x 
     226        String path = "root:Packages:NIST:VSANS:"+fname+":" 
     227        path += "entry:collection_time" 
     228         
     229        Wave/Z w = $path 
     230        if(waveExists(w) == 0) 
     231                return(1) 
     232        else 
     233        w[0] = val 
     234                return(0) 
     235        endif 
     236 
    218237End 
    219238 
     
    748767end 
    749768 
     769// fname is a local WORK folder 
     770Function V_putDetector_counts(fname,val) 
     771        String fname 
     772        Variable val 
     773 
     774//root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FB:beam_center_x 
     775        String path = "root:Packages:NIST:VSANS:"+fname+":" 
     776        path += "entry:control:detector_counts" 
     777         
     778        Wave/Z w = $path 
     779        if(waveExists(w) == 0) 
     780                return(1) 
     781        else 
     782        w[0] = val 
     783                return(0) 
     784        endif 
     785 
     786End 
    750787 
    751788Function V_writeDetector_preset(fname,val) 
     
    852889        return(err) 
    853890end 
     891 
     892// fname is a local WORK folder 
     893Function V_putControlMonitorCount(fname,val) 
     894        String fname 
     895        Variable val 
     896 
     897//root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FB:beam_center_x 
     898        String path = "root:Packages:NIST:VSANS:"+fname+":" 
     899        path += "entry:control:monitor_counts" 
     900         
     901        Wave/Z w = $path 
     902        if(waveExists(w) == 0) 
     903                return(1) 
     904        else 
     905        w[0] = val 
     906                return(0) 
     907        endif 
     908 
     909End 
    854910 
    855911//integer value 
     
    32363292End 
    32373293 
     3294// fname is a local WORK folder 
     3295Function V_putBeamMonNormSaved_count(fname,val) 
     3296        String fname 
     3297        Variable val 
     3298 
     3299        String path = "root:Packages:NIST:VSANS:"+fname+":" 
     3300        path += "entry:instrument:beam_monitor_norm:saved_count" 
     3301         
     3302        Wave/Z w = $path 
     3303        if(waveExists(w) == 0) 
     3304                return(1) 
     3305        else 
     3306        w[0] = val 
     3307                return(0) 
     3308        endif 
     3309 
     3310End 
     3311 
     3312 
     3313 
    32383314Function V_writeBeamMonNormType(fname,str) 
    32393315        String fname,str 
     
    43674443//      endif 
    43684444        return(err) 
     4445End 
     4446 
     4447// fname is a local WORK folder 
     4448Function V_putDet_IntegratedCount(fname,detStr,val) 
     4449        String fname,detStr 
     4450        Variable val 
     4451 
     4452//root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FB:beam_center_x 
     4453        String path = "root:Packages:NIST:VSANS:"+fname+":" 
     4454        path += "entry:instrument:detector_"+detStr+":integrated_count" 
     4455         
     4456        Wave/Z w = $path 
     4457        if(waveExists(w) == 0) 
     4458                return(1) 
     4459        else 
     4460        w[0] = val 
     4461                return(0) 
     4462        endif 
     4463 
    43694464End 
    43704465 
Note: See TracChangeset for help on using the changeset viewer.