Skip to content
Snippets Groups Projects

Merge tag 21.0.91-21.0.92 into 21.9

Merged Merge tag 21.0.91-21.0.92 into 21.9
jchapman/athena:Merge21.3.9into21.9Branch into 21.9
Merged John Derek Chapman requested to merge jchapman/athena:Merge21.3.9into21.9Branch into 21.9
  1. Feb 07, 2019
  3. Feb 05, 2019
  5. Jan 18, 2019
  7. Jan 15, 2019
  9. Jan 14, 2019
  11. Jan 12, 2019
  13. Jan 11, 2019
    • sutt's avatar
      Fix compilation of TrigJspiMonitoring · f6c84c8c
      sutt authored 
      This TrigJpsiMonitoring is legacy code that is no longer used and should
probably be removed from the release. It uses the base classes from
TrigInDetAnalysis and so this change is to take account of the fix
in the TrigInDetAnalysis headers made for compilance with the coding
rules.

There are still remaining many warnings about deprecated variables such
as the endOfRun, but since all this code will be changed in the future
and I don't see much point in fixing this at this stage, and instead we
should just archive this code, but accept this fix just for the time
being so that the release will at least build.
      f6c84c8c
    • sutt's avatar
      Fix some doxygen complient headers, fix the protection of the base class for the particleType class · 6e2a0855
      sutt authored 
      Some of the head comments were skipped when making fixing the doxygen
compliance, this change fixes those.

In addition, it also fixes the protection of the base class of the
particleType class. This class inherits from ad std::map<int,string>
and ordinarily one should *never* inherit from and std class in this
way.

However, this change makes the base class private so that the map
can never be exposed either from this class or any subsequently
derived class, and so avoids all the very sound reasons why
inheritance like this would otherwise be a very bad idea.
      6e2a0855
    • sutt's avatar
      Large merge to import TrigInDetAnalysis changes from final 21.1-dev to 21.3 · cd30af94
      sutt authored 
          Includes the merge of code from last version of 21.1-dev to 21.3, so all
    functional changes were already reviewed and fully validated when in the
    initial MR for 21.1-dev so we don;t need these reviewed again, and just
    need to see the output from the validation to determine whether this sync
    has worked.

    These functional changes inclue addition of a new header file required for
    matching the full trigger objects with the tracks needed for the full object
    selection

    Additional changes not from 21.1-dev includes some tidy up of the comments.

    Since it was merging 21.1-dev without the copyright, decided to use the
    oportunity to modify all the file head comments to be more properly
    doxygen complient as suggested in the coding guidelines. Also updated
    the year from 2018 to 2019 since I was here.

    There are also many other code complience cosmetic changes, eg replacing all
    the __FILENAME_H with PACKAGE_FILENAME_H in the include guards and so on/

    As this is such a large set of changes there will inevitably be some code
    guidelines complience issues that have been missed. I would prefer to
    merge the ones that we have now, and then fix the rest in additional merge
    requests over the coming days.

    These changes are to some extent further discussed in ATR-19009 which these
    changes partly address.
      cd30af94
    • Rafal Bielski's avatar
      Update art-include in TriggerTest · bf1f74f1
      Rafal Bielski authored 
      Remove 21.1-dev/AthenaP1 (deleted branch) and master/AthenaP1 (non-existent project).
Add 21.3 where missing.
Remove duplicated entries.
      bf1f74f1
    • Denis Oliveira Damazio's avatar
      remove couts · 8cae7441
      Denis Oliveira Damazio authored
      8cae7441
    • Denis Oliveira Damazio's avatar
      little fix for bitmask · 5ade43a3
      Denis Oliveira Damazio authored
      5ade43a3
    • Denis Oliveira Damazio's avatar
      Modification to include new BCID. · f00671d5
      Denis Oliveira Damazio authored
      f00671d5
    • Stefano Rosati's avatar
      Fixes · b5139923
      Stefano Rosati authored 
      	modified:   MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/SimpleMMClusterBuilderTool.cxx
      b5139923
  15. Jan 10, 2019
  17. Jan 09, 2019
  19. Jan 08, 2019
  21. Jan 07, 2019
  23. Dec 25, 2018
  25. Dec 24, 2018
  27. Dec 22, 2018
  29. Dec 21, 2018
  31. Dec 20, 2018
  33. Dec 19, 2018
  35. Dec 18, 2018
  37. Dec 17, 2018
  39. Dec 16, 2018
  41. Dec 15, 2018
  43. Dec 14, 2018
  45. Dec 13, 2018