Changeset 663


Ignore:
Timestamp:
Jun 25, 2018 3:17:15 PM (4 years ago)
Author:
ilavsky
Message:

Add User Form factors for Irena

Location:
trunk
Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/User Procedures/Irena/IR1_FormFactors.ipf

    r658 r663  
    11#pragma TextEncoding = "UTF-8"
    22#pragma rtGlobals=1             // Use modern global access method.
    3 #pragma version=2.28
     3#pragma version=2.29
    44
    55Constant AlwaysRecalculateFF = 0                        //set to 1 to recalculate always the FF.
     
    1212//*************************************************************************/
    1313
     14//2.29 remove Unified fit form factors from form factor listings, code stays, but shoudl not be used anymore. Let's see if someone complains.
    1415//2.28 added controls for debugging (at the top) and added Cylinder and Spheroid as optional XOP form factor.
    1516//2.27 fixed IR1T_CreateAveVolumeWave, IR1T_CreateAveSurfaceAreaWave  to have all form factors, do nto foget to fix next time when adding new FF
     
    100101        NewDataFolder/O/S root:Packages:FormFactorCalc
    101102       
    102         string/g ListOfFormFactors="Spheroid;Cylinder;CylinderAR;CoreShell;CoreShellShell;CoreShellCylinder;User;Integrated_Spheroid;Unified_Sphere;Unified_Rod;Unified_RodAR;Unified_Disk;Unified_Tube;Fractal Aggregate;"
     103        //string/g ListOfFormFactors="Spheroid;Cylinder;CylinderAR;CoreShell;CoreShellShell;CoreShellCylinder;User;Integrated_Spheroid;Unified_Sphere;Unified_Rod;Unified_RodAR;Unified_Disk;Unified_Tube;Fractal Aggregate;"
     104        string/g ListOfFormFactors="Spheroid;Cylinder;CylinderAR;CoreShell;CoreShellShell;CoreShellCylinder;User;Integrated_Spheroid;Fractal Aggregate;"
    103105        ListOfFormFactors+="NoFF_setTo1;SphereWHSLocMonoSq;Janus CoreShell Micelle 1;Janus CoreShell Micelle 2;Janus CoreShell Micelle 3;CoreShellPrecipitate;"//"
    104106#if (exists("ParallelepipedX")&&defined(UseXOPforFFCalcs))
    105107        ListOfFormFactors+="---NIST XOP : ;RectParallelepiped;"
    106108#endif 
    107         string/g ListOfFormFactorsSD="Spheroid;Cylinder;CylinderAR;Unified_Sphere;Unified_Rod;Unified_RodAR;Unified_Disk;Unified_Tube;"
     109        string/g ListOfFormFactorsSD="Spheroid;Cylinder;CylinderAR;"//Unified_Sphere;Unified_Rod;Unified_RodAR;Unified_Disk;Unified_Tube;"
    108110        string/g CoreShellVolumeDefinition
    109111        SVAR CoreShellVolumeDefinition                  //this will be user choice for definition of volume of core shell particle: "Whole particle;Core;Shell;", NIST standard definition is Whole particle, default...
  • trunk/User Procedures/Irena/IR1_Sizes.ipf

    r660 r663  
    25942594        Button GetHelp,pos={305,105},size={80,15},fColor=(65535,32768,32768), proc=IR1R_GraphDataButton,title="Get Help", help={"Open www manual page for this tool"}
    25952595       
    2596         SetVariable SlitLength,pos={125,186},size={140,16},title="Slit Length   ", help={"If slit smeared data, input slit length (automatically inserted for Indra 2 data"}
     2596        SetVariable SlitLength,pos={125,174},size={140,16},title="Slit Length   ", help={"If slit smeared data, input slit length (automatically inserted for Indra 2 data"}
    25972597        SetVariable SlitLength,limits={0,Inf,0.001},value= root:Packages:Sizes:SlitLength, disable=!(root:Packages:Sizes:UseSlitSmearedData)
    25982598
Note: See TracChangeset for help on using the changeset viewer.