Changeset 852


Ignore:
Timestamp:
Feb 4, 2020 9:56:55 AM (21 months ago)
Author:
ilavsky
Message:

Minor fixes

Location:
trunk/User Procedures
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/User Procedures/AnisoSAS/ASAS_IntAnisotropy.ipf

    r529 r852  
    150150               
    151151                if ((ModelContainsNaNs!=0)||(DataContainNaNs!=0))
    152                         DoAlert 0, "Model or Exp Data for graph "+GraphNameToUse+" contained NaNs, graph will not be displayed"
    153                 else
    154                         settings= WMPolarSettingsNameForGraph(GraphNameToUse)
    155                         WMPolarRemovePolarGraphData(GraphNameToUse, settings)
    156                         ASAS_PolarPlot(waveToDisplay, GraphNameToUse)
    157                         DoWindow/T $(GraphNameToUse),GraphTitleToUse
    158                         if (ExpDataExists )
    159                                 string polesTraceName=WMPolarAppendTrace(GraphNameToUse,ExpIntensityWave, ExpAngleWave, 360)
    160         //                      WMAppendPolarTrace(GraphNameToUse,ExpIntensityWave, ExpAngleWave, 360)          //this should work but does not
    161                         endif
    162                         WMPolarAxesRedrawGraphNow(GraphNameToUse)
    163                         if (ExpDataExists )
    164                                 ModifyGraph lsize(polarY1)=2,rgb(polarY1)=(0,0,0)
    165                         endif
    166                         SetAxis/W=$GraphNameToUse /N=1/A
    167                 endif
     152                        DoAlert 0, "Model or Exp Data for graph "+GraphNameToUse+" contained NaNs, these will be cleaned up"
     153                        IN2G_RemoveNaNsFrom2Waves(ExpIntensityWave,ExpAngleWave)       
     154                        IN2G_RemoveNaNsFrom1Wave(waveToDisplay)                         
     155                endif
     156               
     157                settings= WMPolarSettingsNameForGraph(GraphNameToUse)
     158                WMPolarRemovePolarGraphData(GraphNameToUse, settings)
     159                ASAS_PolarPlot(waveToDisplay, GraphNameToUse)
     160                DoWindow/T $(GraphNameToUse),GraphTitleToUse
     161                if (ExpDataExists )
     162                        string polesTraceName=WMPolarAppendTrace(GraphNameToUse,ExpIntensityWave, ExpAngleWave, 360)
     163                        //                      WMAppendPolarTrace(GraphNameToUse,ExpIntensityWave, ExpAngleWave, 360)          //this should work but does not
     164                endif
     165                WMPolarAxesRedrawGraphNow(GraphNameToUse)
     166                if (ExpDataExists )
     167                        ModifyGraph lsize(polarY1)=2,rgb(polarY1)=(0,0,0)
     168                endif
     169                SetAxis/W=$GraphNameToUse /N=1/A
     170               
    168171        endfor
    169172end
  • trunk/User Procedures/Indra 2/IN2_GeneralProcedures.ipf

    r843 r852  
    53085308//**********************************************************************************************
    53095309//**********************************************************************************************
     5310Function IN2G_RemoveNaNsFrom1Wave(Wv1)                                                  //removes NaNs from 3 waves
     5311        Wave Wv1                                //assume same number of points in the waves
     5312       
     5313        IN2G_PrintDebugStatement(IrenaDebugLevel, 5,"")
     5314        variable i=0, imax=numpnts(Wv1)-1
     5315        for (i=imax;i>=0;i-=1)
     5316                if (numtype(Wv1[i])==2)
     5317                        Deletepoints i, 1, Wv1
     5318                endif
     5319        endfor
     5320end
     5321//**********************************************************************************************
     5322//**********************************************************************************************
    53105323Function IN2G_RemoveNaNsFrom5Waves(Wv1,wv2,wv3,wv4,wv5)         //removes NaNs from 5 waves
    53115324        Wave Wv1, Wv2, Wv3, wv4,wv5                                     //assume same number of points in the waves
  • trunk/User Procedures/Indra 2/IN3_Main.ipf

    r848 r852  
    995995        NVAR FlyScanRebinToPoints
    996996        if(FlyScanRebinToPoints<100)
    997                 FlyScanRebinToPoints=300
     997                FlyScanRebinToPoints=500                        //2020-2-3 changed to 500, cpu seems to be good by now.
    998998        endif
    999999        NVAR DisplayAlignSaAndBlank
  • trunk/User Procedures/Indra 2/spec.ipf

    r714 r852  
    10841084                String/G root:Packages:spec:specScanPositions=ListPosOfLineTypes(fileVar,"#S ")
    10851085                String/G root:Packages:spec:specScanPositionsID=idStr
     1086                //string/g root:Packages:spec:specScanPositions
    10861087                SVAR specScanPositions=root:Packages:spec:specScanPositions
    10871088                Variable scanNum
  • trunk/User Procedures/Irena/IR1_FormFactors.ipf

    r832 r852  
    104104        //string/g ListOfFormFactors="Spheroid;Cylinder;CylinderAR;CoreShell;CoreShellShell;CoreShellCylinder;User;Integrated_Spheroid;Unified_Sphere;Unified_Rod;Unified_RodAR;Unified_Disk;Unified_Tube;Fractal Aggregate;"
    105105        string/g ListOfFormFactors="Spheroid;Cylinder;CylinderAR;CoreShell;CoreShellShell;CoreShellCylinder;User;Integrated_Spheroid;Fractal Aggregate;"
    106         ListOfFormFactors+="NoFF_setTo1;SphereWHSLocMonoSq;Janus CoreShell Micelle 1;Janus CoreShell Micelle 2;Janus CoreShell Micelle 3;CoreShellPrecipitate;"//"
     106        ListOfFormFactors+="NoFF_setTo1;SphereWHSLocMonoSq;Janus CoreShell Micelle 1;Janus CoreShell Micelle 2;Janus CoreShell Micelle 3;CoreShellPrecipitate;"//Unified_Sphere;"//"
    107107#if (exists("ParallelepipedX")&&defined(UseXOPforFFCalcs))
    108108        ListOfFormFactors+="---NIST XOP : ;RectParallelepiped;"
Note: See TracChangeset for help on using the changeset viewer.