Changed forChannel and forModule to better handle ranges. #212
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updated the output when a parsing error is encountered to display the event previous, at, and following the parsing error. In addition, during the run end process if an error had been encountered the FIFO is not read out as we may have missed a partial event and would be lost. Former-commit-id: c503a24
Mistakenly used the wrong event size for the truncation message display for the event following the parsing error. Former-commit-id: 2ddfe43
Previously one error would supress the others. Now all messages are printed. Former-commit-id: e943de0
Added the capability to specify modules or channels with a colon character delimiting a range. For example, pwrite 0 0:4 TRIGGER_THRESHOLD 0x1a would set the trigger threshold for module 0 and channels 0-4 to the hex value 0x1a (decimal 26). Also, acceptable input includes scientific notation and octal. Former-commit-id: 209d663
Former-commit-id: 92ebfe0
I have addressed a magic number in the Gsl2Fitter, the magic number 100 was actually the maximum number of iterations. Former-commit-id: 1ea30e5
The globals_ variable had been added for simplicity, but was only used in a single instance so created unnecessary code bloat. Former-commit-id: 180ed87
Former-commit-id: c326e9b
Former-commit-id: 0ebed3f
When tests is enabled we now search for the UnitTest++ library and includes. This package is not currently required since the written tests do not explicitly use it. (yet) Former-commit-id: 90cfe6c
Former-commit-id: a3c125b
The CMakeLists.txt have all been updated so that we can begin to build the tests for the classes in Core. I have added the UnitTest++ package as a required package before the utkscan tests can be built. Former-commit-id: 6163282
I have moved the Model_* methods to be public so that they can be unit tested. I am also tweaking the methods so that they use const references to avoid unnecessary copies. Former-commit-id: 8342231
Creating unit tests for Identifier to ensure that the methods are working properly. Former-commit-id: d768cf9
I also moved the methods to calculate the parameters to protected from public. Former-commit-id: 7f59305
I wanted to move this up a directory since I will soon be writing unit tests for some of the other classes not specific to utkscan. Former-commit-id: 5673860
It was used for exactly two values, which are repeated and hard coded in the Unpacker class. They are not used at all in any of the utkscan related code, and are unnecessary. Former-commit-id: 6a0f20f
The pixie configuration file, pixie.cfg, can now handle an arbitrary number of module types. This is handled by the new tag ModuleType. The tags were split into two groups, module and global types. The global types include: * PixieBaseDir * CrateConfig * SlotFile * DspSetFile * DspWorkSetFile While the module type tags include: * ModuleType * ModuleBaseDir * SpFpgaFile * ComFpgaFile * DspConfFile * DspVarFile If the ModuleType tag is not found all module type files are assumed to be set for the "default" module type, once a ModuleType tag is found all subsequent files are assumed to be unique to that module type. For global type tags the PixieBaseDir is used. For module type tags the ModuleBaseDir is used first, followed by the PixieBaseDir. If no valid base directory is found the current working directory is used as the base. It is no longer required to indicate in the slot_def.set file which modules use the default and alternate configurations. The configuration is determined by polling the module for its type and using the configuration specified for that type. If no matching type was registered in the configuration an error message is produced. For system with a single type of modules if the module type was not found the "default" type is tried. Former-commit-id: 9ef7fbe
When the user changes `PXI_ROOT_DIR` in the cache, nothing happens as the underlying `PXI_LIBRARY_DIR` is cached. Changed to force a new search at every cmake invocation. Also, require libPixie16Sys.a to be present in `PXI_LIBRARY_DIR`. Former-commit-id: b0d7765
The module now provides PXI_LIBRARY_DIR and PXI_FIRMWARE_DIR. PXI_LIBRARY_DIR specifies the location of the libraries needed for compilation. PXI_FIRMWARE_DIR specifies the directory where the firmware files can be found, typically /opt/xia/. PXI_CONFIG now search PXI_FIRMWARE_DIR for multiple firmwares for various module types and attempts to determine their type. This is then assembled into the pixie.cfg file written to share/config. Former-commit-id: 6bb56dc
Any modules types listed same as a previous one will be ignored. Former-commit-id: 76b4a97
Since the firmware is searched separately from the software it is no longer necessary to create the /opt/xia/current link. Instead /opt/xia/software can be created. Both are supported. Former-commit-id: 2e04cff
RevD modules are all 12b100m and the firmware file may not list this information. If we find revd we can guess and put this information in the config file. Former-commit-id: ea937e5
The type is now set the to "unknown" if the bit resultion and adc rate can not be determined. Former-commit-id: 5501718
The slot set portion was commented out. This led to slot read errors. Former-commit-id: 0de3c4c
Added padding to make the output more pleasant. Former-commit-id: b49da9a
It was request that the error messages be more clear. Revised both the messages at the cmake level during autoconfiguring and those placed in pixie.cfg. Former-commit-id: 0f7a58e
Added some information about how the pixie.cfg file works. Former-commit-id: 47d5dcc
We do not really need this check since what we care about is that the phase is behaving properly.
add a check that the qdcCompression value (if pressent ) is non-zero. I also added a way to throw a custom critical error message.
This closes issue #259.
The save command will write the DSP parameters to the set file specified in pixie.cfg or provides an option to write to a different file for backup.
line 661 was missing an terminating ".
Previously save help would print the expanded help message but would also write out a file called help. Users wanted a bit more information on the brief help
The ranges specifed with a colon are now passed to dedicated functions. This resolves a sorting issue and reduces code bloat.
Member
|
I think that this PR is also too far out of date to successfully be merged at this point. Plus the fact that there are all these additional commits outside of the actual useful one is suspicious. |
Member
|
@ksmith0, can you update this branch to the latest HEAD of dev and resubmit the request? |
Contributor
Author
|
This need to be rebased or cherry-picked before being merged. |
spaulaus
requested changes
Jun 8, 2017
Member
spaulaus
left a comment
spaulaus
left a comment
There was a problem hiding this comment.
Needs to be rebased before merge can be done.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The ranges specifed with a colon are now passed to dedicated functions.
This resolves a sorting issue and reduces code bloat.