Changeset 1199


Ignore:
Timestamp:
Mar 11, 2022 5:59:34 PM (9 months ago)
Author:
ilavsky
Message:

3D solid again

Location:
trunk/User Procedures/Irena
Files:
2 edited

Legend:

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

    r1180 r1199  
    514514        NVAR DOA=DegreeOfAggregation
    515515        NVAR Stick=StickingProbability
    516         NVAR SMeth=StickingMethod
     516        //NVAR SMeth=StickingMethod
    517517        NVAR dMin=DminValue
    518518        NVAR df = dfValue
     
    581581//******************************************************************************************************************************************************
    582582//******************************************************************************************************************************************************
    583 static Function IR3A_Append1DInMassFracAgg(IntensityWV,QvectorWV)
     583Function IR3A_Append1DInMassFracAgg(IntensityWV,QvectorWV)
    584584        wave IntensityWV,QvectorWV
    585585
     
    610610        if(strlen(DataFolderName)<4)
    611611                //this is non sensical case. Use Model3DAggIntensity to get proper normalization
    612                 Wave/Z IntWaveOriginal = root:Aggregate1DModel:Model3DAggIntensity
    613                 Wave/Z QwaveOriginal = root:Aggregate1DModel:A3DAgg1DQwave
     612                Wave/Z IntWaveOriginal = root:Packages:Irena_UnifFit:Model3DAggIntensity
     613                Wave/Z QwaveOriginal = root:Packages:Irena_UnifFit:A3DAgg1DQwave
    614614                if(!WaveExists(IntWaveOriginal))
    615615                        abort
  • trunk/User Procedures/Irena/IR3_3DSupportFunctions.ipf

    r1180 r1199  
    477477// this is probably useful most for Fractal Aggregate and not for 3D solid... 
    478478
     479//note: to prevent box size effects (3D solid mainly) we need to use trick where we extend the box and suround it with homogeneously filled pixels
     480// these pixels need to be set to mean value of pixels in original box. This smears the edges and shoudl supress the box scattering we have seen in other cases.
     481// this is trick from Larry and other places which can calculate scattering from image.
     482
    479483Function IR3T_CreatePDFIntensity(ThreeDVoxelGram, IsoValue, Qmin, Qmax, NumQSteps)
    480484        wave ThreeDVoxelGram
     
    514518                wave Use3DWave = ThreeDVoxelGram
    515519        endif
     520       
    516521       
    517522        variable RadMin,RadMax  //for now, these are simply steps in voxels, we are now working with integer of pixel positions...
Note: See TracChangeset for help on using the changeset viewer.