Ignore:
Timestamp:
Jun 8, 2017 1:27:07 PM (5 years ago)
Author:
srkline
Message:

Significant changes to the base READ of individual data fields from data files. Now, if the field requested is from a WORK file, and it does not exist, an error condition is returned (or a null wave). Calling procedures are responsible for handling errors. This prevents a string of open file dialogs if fields are missing from a file if they were never in the file to begin with (like sensor logs, polarization hardware, etc.)

New get/write calls were added for the updated temperature sensor fields.

group_ID is now only in the sample block, not the duplicated in the reduction block, and is correctly a number not a string.

File:
1 edited

Legend:

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

    r1037 r1044  
    1212// 
    1313// TODO 
    14 // -- clean up and remove all of the references to other facilities, since they will not have VSANS modules 
     14// x- clean up and remove all of the references to other facilities, since they will not have VSANS modules 
    1515// -- add in more appropriate and some missing fields more useful to VSANS (intent, multiple beam centers, etc.) 
    1616// -- can I make the choice of columns customizable? There are "sets" of columns that are not used for  
     
    3232// will not be read in, the "bad" local copy will be read in. 
    3333// TODO: 
    34 //  -- this *may* be a very slow operation. Warn users. Give them a choice to keep local copies. If 
     34//  x- this *may* be a very slow operation. Warn users. Give them a choice to keep local copies. If 
    3535//     the "patched" values are written locally too, then maybe the update from disk is not needed. 
    3636//     But typically, I'd like to see that the disk version really did get updated... 
     
    159159 
    160160// TODO: 
    161 //  -- experimental hook with contextual menu 
     161//  x- experimental hook with contextual menu 
    162162//               
    163163                SetWindow kwTopWin hook=V_CatTableHook, hookevents=1    // mouse down events 
     
    170170// will not be read in, the "bad" local copy will be read in for any subsequent operations. 
    171171// TODO: 
    172 //  -- this *may* be a very slow operation. Warn users. Give them a choice to keep local copies? If 
     172//  x- this *may* be a very slow operation. Warn users. Give them a choice to keep local copies? If 
    173173//     the "patched" values are written locally too, then maybe the update from disk is not needed. 
    174174//     But typically, I'd like to see that the disk version really did get updated... 
     
    242242        // 
    243243        // clean out again, so that the file SAVE is not slow due to the large experiment size 
    244         // TODO -- decide if this is really necessary 
     244        // TODO x- decide if this is really necessary (not necessary at this point) 
    245245//       
    246246//      V_CleanOutRawVSANS() 
     
    255255// -- what else to add to the menu? (MSK and DIV now work) 
    256256// -- add directly to WORK files? 
    257 // -- "set" as some special file type, intent, use? 
     257// -- "set" as some special file type, intent, use? (quick "patch" operations) 
    258258// -- "check" the reduction protocol for completeness? 
    259259// 
     
    453453         
    454454//      //read the file alphanumeric suffix 
    455 //      // TODO -- this does not exist for VSANS - so is there an equivalent, or delete? 
     455//      // TODO x- this does not exist for VSANS - so is there an equivalent, or delete? ((delete)) 
    456456//      InsertPoints lastPoint,1,GSuffix 
    457457//      GSuffix[lastPoint]="unknown" 
     
    482482         
    483483        //Attenuators 
    484         // TODO -- this is not really the number -- 
     484        // TODO -- this is not really the number -- but rather the thickness 
    485485        InsertPoints lastPoint,1,GNumAttens 
    486486        GNumAttens[lastPoint]=V_getAttenThickness(fname) 
     
    519519        GRot[lastPoint]=V_getSampleRotationAngle(fname) 
    520520         
    521         // TODO -- this is not yet implemented 
    522521        //Sample Temperature 
    523522        InsertPoints lastPoint,1,GTemp 
    524         GTemp[lastPoint]=-273 
     523        GTemp[lastPoint]=V_getSampleTemperature(fname) 
    525524 
    526525        // TODO -- this is not yet implemented 
    527526        //Sample Field 
    528527        InsertPoints lastPoint,1,GField 
    529         GField[lastPoint]=1000 
     528        GField[lastPoint]=-999 
    530529         
    531530 
Note: See TracChangeset for help on using the changeset viewer.