Skip to content

Merge2branches#41

Merged
TomGoffrey merged 5 commits intomainfrom
merge2branches
Apr 27, 2025
Merged

Merge2branches#41
TomGoffrey merged 5 commits intomainfrom
merge2branches

Conversation

@yramachers
Copy link
Contributor

Proposal to merge the main and noAntennaInfo branches into a single application with CLI switch between these two types of simulations.
Adding noAntennaInfo specific code into latest main version.
Additionally, adapt antenna signal calculation to include time transformation from source time to local antenna time. Adds one more output vector, the source time.

@yramachers yramachers requested a review from TomGoffrey April 25, 2025 15:42
@yramachers
Copy link
Contributor Author

Had a look at the failed test: Default is now set to run the noAntennaInfo case and I had to rename(!) the output TTree branch to "SourceTime" instead of TimeVec (there still is a TimeVec in antenna sim but also(!) a SourceTime vector).
This reflects the observation that the simulation time is the time at the source, i.e. describing the particle motion. The antenna, however, requires the time at the local antenna, with a retardation delay. The noAntennaInfo doesn't need any of that but the naming reflects consistency of concepts while the antenna Sim output now has the SourceTime (is still needed) and the TimeVec contains the local antenna time, specific for each antenna.

@yramachers
Copy link
Contributor Author

If the test wants to run the antenna calculation simulation, it would now need the CLI switch "-a 1", see --help.
Seems to run fine on the SCRTP platform, either option.

@TomGoffrey
Copy link
Contributor

@yramachers I've updated the CI to run in antenna mode. All appears to work fine.

Running in non-antenna mode I do see some errors locally:

G4WT0 > End of Run: number of events to file is 1
toolx::compress_buffer : error in zlib/deflate.
tools::wroot::directory::zip : zipper failed.
toolx::compress_buffer : error in zlib/deflate.
tools::wroot::directory::zip : zipper failed.
toolx::compress_buffer : error in zlib/deflate.
tools::wroot::directory::zip : zipper failed.
tools::wroot::directory::zip : target buffer overflow.
toolx::compress_buffer : error in zlib/deflate.
tools::wroot::directory::zip : zipper failed.
toolx::compress_buffer : error in zlib/deflate.
tools::wroot::directory::zip : zipper failed.
Master thread time: User=0.290000s Real=0.289531s Sys=0.020000s [Cpu=107.1%]
End of Run: number of events to file is 1

but given this works fine in CI and on SCRTP, I'm going to assume it's an issue with my machine, so will merge.

@TomGoffrey TomGoffrey merged commit c17b9dd into main Apr 27, 2025
2 checks passed
@TomGoffrey TomGoffrey deleted the merge2branches branch April 27, 2025 15:51
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