Ignore:
Timestamp:
Aug 30, 2018 11:12:50 AM (4 years ago)
Author:
srkline
Message:

bug fixes for:

RealTime? updating at VSANS
Mask loading at SANS

added highResGain field for VSANS R/W

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MaskUtils.ipf

    r1017 r1114  
    418418//      cmd += num2istr(pixelsX*pixelsY) + " /Q  \"" + fname +"\"" 
    419419 
    420         String GBLoadStr = "GBLoadWave/N=data/T={72,72}/O/S=4/W=1/P=catPathName/U=" 
     420        String GBLoadStr = "GBLoadWave/N=data/T={72,72}/O/S=4/W=1/P=catPathName" 
    421421 
    422422        if(cmpstr("\\\\",fname[0,1])==0)        //Windows user going through network neighborhood 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_DetectorBinning_Q.ipf

    r1109 r1114  
    16511651                folderList = "VCALC;" 
    16521652        endif 
    1653          
     1653 
     1654        if(cmpstr(winNameStr,"WORK_RealTime") == 0) 
     1655                folderList = "RealTime;" 
     1656        endif 
     1657         
     1658                 
    16541659        for(ii=0;ii<ItemsInList(folderList);ii+=1) 
    16551660                fldr = StringFromList(ii, folderList, ";") 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_EventMode_Utils.ipf

    r1101 r1114  
    936936        String saveName 
    937937 
    938         saveName = StringFromList(0, fileName) 
     938        saveName = StringFromList(0, fileName+";") 
    939939        Save_VSANS_file("root:export", "Events_"+saveName) 
    940  
     940        Printf "Saved file %s\r","Events_"+saveName 
    941941End 
    942942 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_RW_Utils.ipf

    r1109 r1114  
    642642 
    643643// (1) if requesting data from a WORK folder, get it, or report error 
    644         Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;") 
     644        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;RealTime;") 
    645645        if(isWORKFolder != -1)          //requesting value from a WORK folder (not RawVSANS) 
    646646        // check for a work folder first (note that "entry" is now NOT doubled) 
     
    700700// (1) if requesting data from a WORK folder, get it 
    701701// no need to check for any existence, null return is OK 
    702         Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;") 
     702        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;RealTime;") 
    703703        if(isWORKFolder != -1)          //requesting value from a WORK folder (not RawVSANS) 
    704704//      // check for a work folder first (note that "entry" is now NOT doubled) 
     
    755755// (1) if requesting data from a WORK folder, get it 
    756756// no need to check for any existence, null return is OK 
    757         Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;") 
     757        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;RealTime;") 
    758758        if(isWORKFolder != -1)          //requesting value from a WORK folder (not RawVSANS) 
    759759//      // check for a work folder first (note that "entry" is now NOT doubled) 
     
    843843 
    844844// (1) if requesting data from a WORK folder, get it, or report error 
    845         Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;") 
     845        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;RealTime;") 
    846846        if(isWORKFolder != -1)          //requesting value from a WORK folder (not RawVSANS) 
    847847        // check for a work folder first (note that "entry" is now NOT doubled) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_Read.ipf

    r1109 r1114  
    15651565End 
    15661566 
     1567// for "B" only 
     1568Function V_getDetector_highResGain(fname,detStr) 
     1569        String fname,detStr 
     1570 
     1571        String path = "entry:instrument:detector_"+detStr+":highResGain" 
     1572        if(cmpstr(detStr,"B") == 0) 
     1573                return(V_getRealValueFromHDF5(fname,path)) 
     1574        else     
     1575                return(0) 
     1576        endif 
     1577End 
     1578 
    15671579Function/S V_getDetDescription(fname,detStr) 
    15681580        String fname,detStr 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_Write.ipf

    r1109 r1114  
    43144314        endif 
    43154315End 
     4316 
     4317// high res detector gain, a single value, only for detB 
     4318Function V_writeDetector_highResGain(fname,detStr,val) 
     4319        String fname,detStr 
     4320        variable val 
     4321 
     4322//      String path = "entry:instrument:detector_"+detStr+":highResGain" 
     4323        if(cmpstr(detStr,"B") == 0) 
     4324         
     4325                Make/O/D/N=1 wTmpWrite 
     4326        //      Make/O/R/N=1 wTmpWrite 
     4327                String groupName = "/entry/instrument/detector_"+detStr  
     4328                String varName = "highResGain" 
     4329                wTmpWrite[0] = val 
     4330         
     4331                variable err 
     4332                err = V_WriteWaveToHDF(fname, groupName, varName, wTmpWrite) 
     4333                if(err) 
     4334                        Print "HDF write err = ",err 
     4335                endif 
     4336                // now be sure to kill the data folder to force a re-read of the data next time this file is read in 
     4337        //      err = V_KillNamedDataFolder(fname) 
     4338        //      if(err) 
     4339        //              Print "DataFolder kill err = ",err 
     4340        //      endif 
     4341         
     4342                return(err)      
     4343        else 
     4344                DoAlert 0,"Bad call to V_writeDetector_highResGain" 
     4345                return(0) 
     4346        endif 
     4347End 
     4348 
    43164349 
    43174350Function V_writeDetDescription(fname,detStr,str) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Initialize.ipf

    r1111 r1114  
    182182        NewDataFolder/O root:Packages:NIST:VSANS:DRK 
    183183        NewDataFolder/O root:Packages:NIST:VSANS:ADJ 
     184        NewDataFolder/O root:Packages:NIST:VSANS:RealTime 
     185        NewDataFolder/O root:Packages:NIST:VSANS:VCALC 
    184186 
    185187 
Note: See TracChangeset for help on using the changeset viewer.