Changeset 1166


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

More fixes

File:
1 edited

Legend:

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

    r1165 r1166  
    449449
    450450        //NOw check for Cromer database for selected strings we need
    451         SVAR/Z '10'
    452         SVAR/Z '25'
    453         SVAR/Z '78'
    454         if(!SVAR_Exists('10') ||!SVAR_Exists('25') ||!SVAR_Exists('78'))
     451        //root:Packages:CromerCalculations:S32
     452        SVAR/Z test1=$("root:Packages:CromerCalculations:S10")
     453        SVAR/Z test2=$("root:Packages:CromerCalculations:S25")
     454        SVAR/Z test3=$("root:Packages:CromerCalculations:S78")
     455        if(!SVAR_Exists(test1) ||!SVAR_Exists(test2) ||!SVAR_Exists(test3))
    455456                Cromer_InitializeStrings()     
    456457        endif
    457458       
    458459        //NOw check for Cromer database for selected waves we need
    459         Wave/Z '10Wv'
    460         Wave/Z '25Wv'
    461         Wave/Z '78Wv'
    462         if(!WaveExists('10Wv') ||!WaveExists('25Wv') ||!WaveExists('78Wv'))
     460        //root:Packages:CromerCalculations:'6Wv'
     461        Wave/Z testw1=$("root:Packages:CromerCalculations:'10Wv'")
     462        Wave/Z testw2=$("root:Packages:CromerCalculations:'25Wv'")
     463        Wave/Z testw3=$("root:Packages:CromerCalculations:'78Wv'")
     464        if(!WaveExists(testw1) ||!WaveExists(testw2) ||!WaveExists(testw3))
    463465                Cromer_InitializeWaves()
    464466        endif   
     
    726728        if (!WaveExists(Awave) || !WaveExists(Bwave) || !WaveExists(Cnumber))
    727729                Cromer_InitializeStrings()
    728                 Initialize_f0()
     730                Initialize_f0(1)
    729731                Wave/Z Awave=$("root:Packages:CromerCalculations:"+possiblyQuoteName(AtomName+"_a"))
    730732                Wave/Z Bwave=$("root:Packages:CromerCalculations:"+possiblyQuoteName(AtomName+"_b"))
     
    10621064//              initialization routines for this package
    10631065//********************************************************************************************************************************
    1064 static Function Initialize_f0()
     1066static Function Initialize_f0(Force)
     1067        variable Force
    10651068
    10661069        DFref oldDf= GetDataFolderDFR()
     
    10691072        NewDataFolder/O/S root:Packages:CromerCalculations
    10701073       
    1071         //Wave/Z H_a
    1072         //if (WaveExists(H_a))
    1073         //      return 0
    1074         //endif
     1074        Wave/Z H_a
     1075        if (WaveExists(H_a)&&!Force)
     1076                return 0
     1077        endif
    10751078        //********************************     H
    10761079        make/N=4/O H_a, H_b
Note: See TracChangeset for help on using the changeset viewer.