Changeset 1165


Ignore:
Timestamp:
Nov 24, 2021 9:26:37 AM (11 months ago)
Author:
ilavsky
Message:

Fixes for Anomalous calculator

Location:
trunk/User Procedures
Files:
5 edited

Legend:

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

    r1102 r1165  
    432432
    433433        if (Force)
     434                KillDataFolder/Z root:Packages:CromerCalculations
     435                NewDataFolder/O/S root:Packages:CromerCalculations
    434436                Cromer_SetLookupLists()
    435437                Cromer_InitializeStrings()
     
    552554        endif
    553555        //here goes Whaqt John has done - saveing results in backup and reusing when fitting... Need to add later.
    554         SVAR AtomInformation=$("root:Packages:CromerCalculations:S"+num2str(iz))
     556        SVAR/Z AtomInformation=$("root:Packages:CromerCalculations:S"+num2str(iz))
     557        if(!SVAR_Exists(AtomInformation))
     558                Cromer_InitializeStrings()
     559                SVAR AtomInformation=$("root:Packages:CromerCalculations:S"+num2str(iz))
     560        endif
     561       
    555562        //Wave CurElementWv=$(num2str(CurElementNumber)+"Wv")
    556563        //the idexes are: p - number of triplet lines, q - up to 11 numbers, r - in r=0 we have energies, in r=1 we have cross sections in barns
     
    718725       
    719726        if (!WaveExists(Awave) || !WaveExists(Bwave) || !WaveExists(Cnumber))
     727                Cromer_InitializeStrings()
    720728                Initialize_f0()
    721729                Wave/Z Awave=$("root:Packages:CromerCalculations:"+possiblyQuoteName(AtomName+"_a"))
     
    10611069        NewDataFolder/O/S root:Packages:CromerCalculations
    10621070       
    1063         Wave/Z H_a
    1064         if (WaveExists(H_a))
    1065                 return 0
    1066         endif
     1071        //Wave/Z H_a
     1072        //if (WaveExists(H_a))
     1073        //      return 0
     1074        //endif
    10671075        //********************************     H
    10681076        make/N=4/O H_a, H_b
  • trunk/User Procedures/Irena/IR1_ScattContrast.ipf

    r1116 r1165  
    206206
    207207        if(cmpstr(ctrlName,"AnomalousCalc")==0)
     208                IR1_ResetCromerDataBase()
    208209                DoWIndow IR1K_AnomCalcPnl
    209210                if(V_Flag)
  • trunk/User Procedures/Irena/IR3_3DTwoPhaseSolid.ipf

    r1069 r1165  
    13001300                print "Using FFT to generate 2 phase solid, this is not optimized yet"
    13011301                //here we can take over by use of FFT...
    1302                 Duplicate AutoCorfnctGr, PositiveAutoCorfnctGr
     1302                Duplicate/O AutoCorfnctGr, PositiveAutoCorfnctGr
    13031303                PositiveAutoCorfnctGr = PositiveAutoCorfnctGr[p]>0 ? PositiveAutoCorfnctGr : 0
    13041304                IR3T_UseFFTtoGenerateMatrix(AutoCorfnctGr,PositiveAutoCorfnctGr, alfaValue, BoxResolution, BoxSideSize)
     
    22882288        DoWIndow TwoPhaseSolid3D
    22892289        if(V_Flag)
    2290 
    2291                 ModifyGizmo ModifyObject=Solid,objectType=voxelgram,property={ valueRGBA,0,GizmoFillSolid,0.000015,0.195544,0.800000,1.000000}
     2290//              ModifyGizmo/N=TwoPhaseSolid3D ModifyObject=Solid,objectType=voxelgram,property={ valueRGBA,0,GizmoFillSolid,0.000015,0.195544,0.800000,1.000000}
     2291                print "I do nothing, Solid object does not exist for some reason"
    22922292        endif
    22932293end
  • trunk/User Procedures/Irena/IR3_SystemSpecificModels.ipf

    r1164 r1165  
    663663                                endif
    664664                                break           // exit from switch
    665                         case "Benedetti-Cicariello":    // execute if case matches expression
     665                        case "Benedetti-Ciccariello":   // execute if case matches expression
    666666                                //BCParNames = {"PorodsSpecSurfArea", "CoatingsThickness","LayerScatLengthDens","SolidScatLengthDensity","VoidScatLengthDensity"}
    667667                                if(StringMatch(cba.ctrlName, "FitModelVarPar1" ))
  • trunk/User Procedures/Nika/NI1_InstrumentSupport.ipf

    r1069 r1165  
    20362036        wave LoadedWvHere
    20372037
    2038         //parse this string ad do what is needed...
     2038        //parse this string and do what is needed...
    20392039        string NewWaveNote=""
    20402040        string currentItemString
     
    20452045        //check that needed metadata are actually there or bail out on users...
    20462046        if(StringMatch(which, "SAXS"))  //require SAXS data
    2047                 if(!stringmatch("*SAXS Detector*", MetadataString))
     2047                if(!stringmatch(MetadataString, "*SAXS Detector*"))
    20482048                        DoAlert 0, "Metadata do not contain SAXS part"
    20492049                        return ""
     
    20512051        endif
    20522052        if(StringMatch(which, "WAXS"))  //require SAXS data
    2053                 if(!stringmatch("*WAXS Detector*", MetadataString))
     2053                if(!stringmatch(MetadataString, "*WAXS Detector*"))
    20542054                        DoAlert 0,  "Metadata do not contain WAXS part"
    20552055                        return ""
Note: See TracChangeset for help on using the changeset viewer.