Changeset 592 for sans/XOP_Dev/SANSAnalysis
- Timestamp:
- Nov 4, 2009 1:20:15 PM (13 years ago)
- Location:
- sans/XOP_Dev/SANSAnalysis/XOP
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sans/XOP_Dev/SANSAnalysis/XOP/SANSAnalysis.c
r507 r592 320 320 break; 321 321 case 92: // y = f(c,y,x) 322 return((long)FuzzySpheresX); // This function is called using the direct method. 323 break; 324 case 93: // y = f(c,y,x) 322 325 return((long)PolyCoreBicelleX); // This function is called using the direct method. 323 326 break; 324 case 9 3:325 return((long)CSParallelepipedX); 326 break; 327 327 case 94: // y = f(c,y,x) 328 return((long)CSParallelepipedX); // This function is called using the direct method. 329 break; 330 328 331 } 329 332 return NIL; -
sans/XOP_Dev/SANSAnalysis/XOP/SANSAnalysis.r
r507 r592 1 /* CylinderFit.r -- resources for CylinderFit2 //now compatible with Project Builder1 /* SANSAnalysis.r -- resources for SANSAnalysis 2 //now compatible with XCode 3 3 */ 4 4 … … 32 32 "-1", // -1 means we don't want to add a menu item. 33 33 "No Menu Item", // Igor ignores item 2 because item 1 is -1. 34 "SANS_Model_Docs_v 3.01", // Name of XOP's help file.34 "SANS_Model_Docs_v4.10", // Name of XOP's help file. 35 35 } 36 36 }; … … 816 816 NT_FP64, /* double precision x */ 817 817 }, 818 "PolyCoreBicelleX", //case # 92 819 F_UTIL | F_THREADSAFE | F_EXTERNAL, /* function category == UTILITY */ 820 NT_FP64, /* return value type */ 821 { 822 NT_FP64 + WAVE_TYPE, /* double precision wave (coefficient wave) */ 823 NT_FP64, /* double precision x */ 824 }, 825 "CSParallelepipedX", //case # 92 826 F_UTIL | F_THREADSAFE | F_EXTERNAL, /* function category == UTILITY */ 827 NT_FP64, /* return value type */ 828 { 829 NT_FP64 + WAVE_TYPE, /* double precision wave (coefficient wave) */ 830 NT_FP64, /* double precision x */ 831 }, 818 819 "FuzzySpheresX", //case # 92 820 F_UTIL | F_THREADSAFE | F_EXTERNAL, /* function category == UTILITY */ 821 NT_FP64, /* return value type */ 822 { 823 NT_FP64 + WAVE_TYPE, /* double precision wave (coefficient wave) */ 824 NT_FP64, /* double precision x */ 825 }, 826 827 "PolyCoreBicelleX", //case # 93 828 F_UTIL | F_THREADSAFE | F_EXTERNAL, /* function category == UTILITY */ 829 NT_FP64, /* return value type */ 830 { 831 NT_FP64 + WAVE_TYPE, /* double precision wave (coefficient wave) */ 832 NT_FP64, /* double precision x */ 833 }, 834 835 "CSParallelepipedX", //case # 94 836 F_UTIL | F_THREADSAFE | F_EXTERNAL, /* function category == UTILITY */ 837 NT_FP64, /* return value type */ 838 { 839 NT_FP64 + WAVE_TYPE, /* double precision wave (coefficient wave) */ 840 NT_FP64, /* double precision x */ 841 }, 842 832 843 833 844 } 845 834 846 }; -
sans/XOP_Dev/SANSAnalysis/XOP/Sphere.c
r452 r592 940 940 } 941 941 942 int 943 FuzzySpheresX(FitParamsPtr p) 944 { 945 double *dp; // Pointer to double precision wave data. 946 float *fp; // Pointer to single precision wave data. 947 double q; //local variables of coefficient wave 948 949 if (p->waveHandle == NIL) { 950 SetNaN64(&p->result); 951 return NON_EXISTENT_WAVE; 952 } 953 954 q= p->x; 955 956 switch(WaveType(p->waveHandle)){ // We can handle single and double precision coefficient waves. 957 case NT_FP32: 958 fp= WaveData(p->waveHandle); 959 SetNaN64(&p->result); 960 return REQUIRES_SP_OR_DP_WAVE; //not quite true, but good enough for now AJJ 4/23/07 961 case NT_FP64: 962 dp= WaveData(p->waveHandle); 963 p->result = FuzzySpheres(dp,q); 964 return 0; 965 default: // We can't handle this wave data type. 966 SetNaN64(&p->result); 967 return REQUIRES_SP_OR_DP_WAVE; 968 } 969 return 0; 970 } 971 -
sans/XOP_Dev/SANSAnalysis/XOP/Sphere.h
r452 r592 31 31 int FCC_ParaCrystalX(FitParamsPtr p); 32 32 int SC_ParaCrystalX(FitParamsPtr p); 33 int FuzzySpheresX(FitParamsPtr p);
Note: See TracChangeset
for help on using the changeset viewer.