Ignore:
Timestamp:
Jul 12, 2017 2:44:26 PM (5 years ago)
Author:
srkline
Message:

a lot of little changes:

changed the name of the Raw Data display procedure file (removed test)

lots of bug fixes, moving items from the macros menu to proper locations, getting the file status to display properly, some error checking, and cleaning up a few TODO items.

File:
1 edited

Legend:

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

    r1050 r1051  
    132132 
    133133// or the other way around 
    134 Proc V_ArrayToTubes(wStr) 
    135         String wStr 
    136          
    137         String/G root:detUsed = wStr 
     134// - get the array into individual tubes ready for fitting. 
     135// 
     136Proc V_ArrayToTubes(detStr) 
     137        String detStr 
     138//      Prompt wStr,"Select detector panel",popup,WaveList("data_*",";","") 
     139        Prompt detStr,"Select detector panel",popup,ksDetectorListAll 
     140         
     141        String/G root:detUsed = detStr 
    138142         
    139143        Variable ii,numTubes=48 
     
    141145         
    142146        Variable dim0,dim1 
    143         dim0 = DimSize($wStr,0) 
    144         dim1 = DimSize($wStr,1) 
     147         
     148        detStr = "root:Packages:NIST:VSANS:RAW:entry:instrument:detector_"+detStr+":data" 
     149         
     150        dim0 = DimSize($detStr,0) 
     151        dim1 = DimSize($detStr,1) 
    145152 
    146153         
     
    154161                 
    155162                if(dim0 == 128) 
    156                         $(str+num2str(ii)) = $(wStr)[p][ii] 
     163                        $(str+num2str(ii)) = $(detStr)[p][ii] 
    157164                else 
    158                         $(str+num2str(ii)) = $(wStr)[ii][p] 
     165                        $(str+num2str(ii)) = $(detStr)[ii][p] 
    159166                endif 
    160167                 
     
    166173 
    167174// (2) -- for each of the tubes, find the x-position (in pixels) of each of the (20) peaks 
    168 // -- load the Analysis Package "MultiPeakFit 2" 
     175// -- automatically loads the Analysis Package "MultiPeakFit 2" 
    169176// 
    170177// automatically find the peaks (after including MultiPeakFit 2) 
     
    194201                Edit/N=Peak_Pixel_Loc peakTableX 
    195202        endif 
    196         DoAlert 0, "Load the Package: Analysis->MultiPeak Fitting->MultiPeak Fitting 2" 
     203         
     204        Execute/P "INSERTINCLUDE <Multi-peak fitting 2.0>" 
     205        DoWindow/K MultiPeak2StarterPanel 
     206 
     207//      DoAlert 0, "Load the Package: Analysis->MultiPeak Fitting->MultiPeak Fitting 2" 
    197208End 
    198209 
     
    10981109// file catalog operation 
    10991110// 
    1100 Macro V_CopyDetectorsToRoot() 
     1111Proc V_CopyDetectorsToRoot() 
    11011112 
    11021113        Duplicate/O root:Packages:NIST:VSANS:RAW:entry:instrument:detector_B:data data_B 
     
    11161127// 
    11171128// 
    1118 Macro V_SaveDetectorsITX() 
     1129Proc V_SaveDetectorsITX() 
    11191130// binary save makes each wave an individual file. Igor text groups them all into one file. 
    11201131//      Save/C data_B,data_FB,data_FL,data_FR,data_FT,data_MB,data_ML,data_MR,data_MT 
Note: See TracChangeset for help on using the changeset viewer.