-
- Downloads
Merge branch 'master' of git.jcns.frm2:GISASFW
Conflicts: App/src/TestMesoCrystal1.cpp
No related branches found
No related tags found
Showing
- App/inc/TestMesoCrystal1.h 2 additions, 0 deletionsApp/inc/TestMesoCrystal1.h
- App/inc/TestMesoCrystal2.h 5 additions, 5 deletionsApp/inc/TestMesoCrystal2.h
- App/src/TestMesoCrystal1.cpp 13 additions, 10 deletionsApp/src/TestMesoCrystal1.cpp
- App/src/TestMesoCrystal2.cpp 51 additions, 155 deletionsApp/src/TestMesoCrystal2.cpp
- Core/Algorithms/inc/ConvolutionDetectorResolution.h 0 additions, 1 deletionCore/Algorithms/inc/ConvolutionDetectorResolution.h
- Core/Algorithms/inc/ISquaredFunction.h 13 additions, 3 deletionsCore/Algorithms/inc/ISquaredFunction.h
- Core/Algorithms/src/ChiSquaredModule.cpp 1 addition, 1 deletionCore/Algorithms/src/ChiSquaredModule.cpp
- Core/Algorithms/src/ConvolutionDetectorResolution.cpp 2 additions, 2 deletionsCore/Algorithms/src/ConvolutionDetectorResolution.cpp
- Core/Samples/src/MaterialManager.cpp 3 additions, 1 deletionCore/Samples/src/MaterialManager.cpp
- Core/Tools/inc/IParameterized.h 1 addition, 0 deletionsCore/Tools/inc/IParameterized.h
- Core/Tools/src/FitSuite.cpp 1 addition, 0 deletionsCore/Tools/src/FitSuite.cpp
- Core/Tools/src/IParameterized.cpp 7 additions, 0 deletionsCore/Tools/src/IParameterized.cpp
- Examples/MesoCrystals/ex02_fitspheres/004_230_P144_im_full_phitheta.txt.gz 0 additions, 0 deletions...tals/ex02_fitspheres/004_230_P144_im_full_phitheta.txt.gz
- Examples/MesoCrystals/ex02_fitspheres/004_230_P144_im_full_qyqz.txt.gz 0 additions, 0 deletions...Crystals/ex02_fitspheres/004_230_P144_im_full_qyqz.txt.gz
- Examples/MesoCrystals/ex02_fitspheres/edf2ascii.py 2 additions, 2 deletionsExamples/MesoCrystals/ex02_fitspheres/edf2ascii.py
- XCode_GISASFW.xcodeproj/project.pbxproj 46 additions, 10 deletionsXCode_GISASFW.xcodeproj/project.pbxproj
Loading
Please register or sign in to comment