Ignore:
Timestamp:
Jan 6, 2012 11:37:33 AM (11 years ago)
Author:
srkline
Message:

minor changes + typo in Model Docs.

Location:
sans/Dev/trunk/NCNR_User_Procedures
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GlobalFit/GlobalFit2_NCNR_v40.ipf

    r570 r832  
    49484948         
    49494949        //the graph 
    4950         Notebook $nb picture={$topGraph(0, 0, 400, 300), -5, 1}, text="\r" 
     4950        Notebook $nb scaling={50,50},picture={$topGraph(0, 0, 800, 600), -5, 1}, text="\r" 
    49514951         
    49524952        // show the top of the report 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_FlipperPanel.ipf

    r829 r832  
    386386                                        cr3 = TotalCR_FromRun(w[selRow][%DD_Trans],err_cr3,0)    
    387387                                        cr4 = TotalCR_FromRun(w[selRow][%UD_Trans],err_cr4,0) 
    388                                         cr5 = TotalCR_FromRun(w[selRow][%Blocked],err_cr5,1)            //blocked beam is NOT normalized to zero attenuators 
     388//                                      cr5 = TotalCR_FromRun(w[selRow][%Blocked],err_cr5,1)            //blocked beam is NOT normalized to zero attenuators 
     389                                        cr5 = TotalCR_FromRun(w[selRow][%Blocked],err_cr5,0)            //blocked beam is NOT normalized to zero attenuators 
    389390         
    390391                                        calc[selRow][%cr_UU] = cr1 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationPanels.ipf

    r829 r832  
    11#pragma rtGlobals=1             // Use modern global access method. 
     2 
     3 
     4// TODO: 
     5// - on the decay panel. need to be able to manually enter a date that is to or an offset 
     6//              number of hours. currently it takes the first file as t=0, which is often not correct 
     7// 
    28 
    39 
     
    683689                                // 1 for each file, return the count rate and err_CR (normalize to atten or not) 
    684690         
    685                                 Print "The Blocked CR is not rescaled to zero attenuators" 
     691                                Print "************The Blocked CR *is* rescaled to zero attenuators -- " 
    686692                                cr1 = TotalCR_FromRun(w[selRow][%Trans_He_In],err_cr1,0) 
    687693                                cr2 = TotalCR_FromRun(w[selRow][%Trans_He_Out],err_cr2,0) 
    688                                 cr3 = TotalCR_FromRun(w[selRow][%Blocked],err_cr3,1)                    //blocked beam is NOT normalized to zero attenuators 
     694//                              cr3 = TotalCR_FromRun(w[selRow][%Blocked],err_cr3,1)                    //blocked beam is NOT normalized to zero attenuators 
     695                                cr3 = TotalCR_FromRun(w[selRow][%Blocked],err_cr3,0)                    //blocked beam is NOT normalized to zero attenuators 
    689696                                 
    690697                                calc[selRow][%CR_Trans_He_In] = cr1 
     
    12811288// - files are all at same SDD 
    12821289// - files are all with same attenuation (just print a warning to cmd) 
     1290// - due to ICE FP values, I need to do a fuzzy comparison 
     1291// 
    12831292// 
    12841293Function ParseDecayRow(w,selRow) 
     
    12861295        Variable selRow 
    12871296         
    1288         Variable err=0, atten1,atten2,atten3,sdd1,sdd2,sdd3 
     1297        Variable err=0, atten1,atten2,atten3,sdd1,sdd2,sdd3,tol 
    12891298        String fname="" 
     1299        tol = 0.01              //SDDs within 1% 
     1300         
    12901301        // are all file numbers valid? 
    12911302        fname = FindFileFromRunNumber(w[selRow][%Trans_He_In]) 
     
    13161327        endif 
    13171328         
    1318         if( (sdd1 != sdd2) || (sdd2 != sdd3) || (sdd1 != sdd3) ) 
     1329         
     1330        if( (abs(sdd1 - sdd2) > tol) || (abs(sdd2 - sdd3) > tol) || (abs(sdd1 - sdd3) > tol) ) 
    13191331                DoAlert 0,"Files in row "+num2str(selRow)+" are not all at the same detector distance" 
    13201332                err = 1 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WriteQIS.ipf

    r829 r832  
    394394         
    395395///////// 
    396         Variable numTextLines=18 
     396        Variable numTextLines=20 
    397397        Make/O/T/N=(numTextLines) labelWave 
    398398        labelWave[0] = "FILE: "+textw[0]+"   CREATED: "+textw[1] 
Note: See TracChangeset for help on using the changeset viewer.