Skip to content

Add diver 1.3#43

Closed
patscott wants to merge 7 commits intomasterfrom
add_diver_1.3
Closed

Add diver 1.3#43
patscott wants to merge 7 commits intomasterfrom
add_diver_1.3

Conversation

@patscott
Copy link
Member

@patscott patscott commented Apr 5, 2025

This is the corresponding PR to GambitBSM/gambit#533.

Here I've added an example of the usage of initial_guesses to the gambit_light_example.yaml file. Note that to run it, you'll need to switch to diver as the scanner, uncomment the regular priors and comment out the python prior. This is because the custom Python prior precludes the use of the new option, as it relies on prior::inverse_transform, which isn't included in gambit_light for Python priors.

patscott added 4 commits April 5, 2025 23:11
…sses in spartan.yaml

	new file:   ScannerBit/include/gambit/ScannerBit/scanners/diver_1.3.0/diver.hpp
	new file:   ScannerBit/src/scanners/diver_1.3.0/diver.cpp
	modified:   cmake/scanners.cmake
	modified:   config/scanner_locations.yaml.default
	modified:   ScannerBit/src/scanners/diver_1.3.0/diver.cpp
	modified:   ScannerBit/src/scanners/diver_1.3.0/diver.cpp
@patscott patscott requested a review from anderkve April 5, 2025 15:11
@patscott
Copy link
Member Author

patscott commented Apr 5, 2025

@aaronvincent

patscott added 3 commits April 6, 2025 01:13
	modified:   yaml_files/gambit_light_example.yaml
	modified:   yaml_files/gambit_light_example.yaml
…hich parameters they set,

and therefore which parameters need to be specified in order to use theire inverse_transform method.
Also updated Diver 1.3 interface to use getSetParameters as a more robust way of checking that the
parameters provided by the user as initial guesses are the same as those being scanned.
	modified:   ScannerBit/include/gambit/ScannerBit/base_prior.hpp
	modified:   ScannerBit/include/gambit/ScannerBit/priors/composite.hpp
	modified:   ScannerBit/src/priors/composite.cpp
	modified:   ScannerBit/src/scanners/diver_1.3.0/diver.cpp
@anderkve
Copy link
Contributor

anderkve commented Apr 6, 2025

Thanks @patscott. But other than the changes in gambit_light_example.yaml, is this PR identical to GambitBSM/gambit#533 ? If so, the preferred way to get this into GAMBIT-light is that we just do the PR GambitBSM/gambit#533 and then I'll trigger the sync action to get all GAMBIT-light relevant updates from GAMBIT as an auto-generated PR to GAMBIT-light.

@patscott
Copy link
Member Author

patscott commented Apr 7, 2025

Thanks @patscott. But other than the changes in gambit_light_example.yaml, is this PR identical to GambitBSM#533 ? If so, the preferred way to get this into GAMBIT-light is that we just do the PR GambitBSM#533 and then I'll trigger the sync action to get all GAMBIT-light relevant updates from GAMBIT as an auto-generated PR to GAMBIT-light.

Yes it is.

Ah OK sorry, didn't realise that's how you're managing it. In that case, do you want me to just close this one, and add the changes to gambit_light_example.yaml to the auto-generated PR when it comes up? In that case I'd just leave this branch in place for @aaronvincent to use until the auto-gen PR is merged.

@anderkve
Copy link
Contributor

anderkve commented Apr 7, 2025

Good plan, let's keep this open until the auto-generated PR is ready to go, and then close it. I'll merge the original GAMBIT PR and run the sync action today.

@anderkve
Copy link
Contributor

anderkve commented Apr 7, 2025

Now everything from this PR is in master via the auto-generated sync PR, so closing this.

@anderkve anderkve closed this Apr 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants