[12gevmoller_sim] [JeffersonLab/remoll] f7220c: Merged unit tests for beam energy into single macr...

[GitHub]

  Branch: refs/heads/integration-new-io
  Home:   https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=u1ry_rAtaja_vsCwJ3jVQRC479t6AT1X9zaQ55h7gjc&s=o1WaUWyut_K8Nf1FvVaP0IPJamYtDODJK_r3T69Olms&e= 
  Commit: f7220c0e871277987b71da92248bba0fcea7e1d6
      https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_f7220c0e871277987b71da92248bba0fcea7e1d6&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=u1ry_rAtaja_vsCwJ3jVQRC479t6AT1X9zaQ55h7gjc&s=XBCgqnLYuiPEKAIAnonsWbvyxqb6kSEYOQ_W9vMkwXQ&e= 
  Author: Wouter Deconinck <wdconinc at gmail.com>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M macros/tests/unit/test_beam_energy.mac
    R macros/tests/unit/test_beam_energy_fail.mac

  Log Message:
  -----------
  Merged unit tests for beam energy into single macro


  Commit: 9a88575eb27ae58f16fcda68fe6b3cecf9487447
      https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_9a88575eb27ae58f16fcda68fe6b3cecf9487447&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=u1ry_rAtaja_vsCwJ3jVQRC479t6AT1X9zaQ55h7gjc&s=Ydp__OyCbXXqUkJ0fz5PNnYgF87YzhAmpKqYb5v3PL0&e= 
  Author: Wouter Deconinck <wdconinc at gmail.com>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M include/remollPrimaryGeneratorAction.hh
    M include/remollVEventGen.hh
    M src/remollPrimaryGeneratorAction.cc
    M src/remollVEventGen.cc

  Log Message:
  -----------
  Moved fBeamTarg from VEventGen to PrimaryGeneratorAction

This moves non-generator variables (beam energy, target size)
out of the event generator and ensures that the logic of
 /remoll/beamene 5 GeV
 /remoll/gen beam
results in a 5 GeV beam generator (not 11 GeV as before).


  Commit: 287f9738737118958afe6f0ff2f76c03db003974
      https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_287f9738737118958afe6f0ff2f76c03db003974&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=u1ry_rAtaja_vsCwJ3jVQRC479t6AT1X9zaQ55h7gjc&s=HjaqS9jiPi7R2gYf5gnJmfLOBVQdQ800nkMm7xH9KhQ&e= 
  Author: Wouter Deconinck <wdconinc at gmail.com>
  Date:   2018-03-25 (Sun, 25 Mar 2018)

  Changed paths:
    M Dockerfile
    A geometry/detectorDaughter_merged.gdml
    A geometry/detector_parametrized.gdml
    A geometry/dumpDaughter.gdml
    A geometry/hallDaughter_dump.gdml
    A geometry/hallDaughter_merged.gdml
    A geometry/hybridDaughter_merged.gdml
    A geometry/materials.xml
    A geometry/materialsNew_parametrized.xml
    A geometry/materialsOptical.xml
    A geometry/materials_dump.xml
    A geometry/matrices.xml
    A geometry/mollerMother_Clamshell_Optimized.gdml
    A geometry/mollerMother_dump.gdml
    A geometry/mollerMother_merged.gdml
    A geometry/mollerMother_parametrized.gdml
    A geometry/solids.xml
    A geometry/solids_parametrized.xml
    A geometry/targetDaughter_Clamshell_Optimized.gdml
    A geometry/targetDaughter_merged.gdml
    A geometry/upstreamDaughter_merged.gdml
    A geometry_dose_tests/hybridDaughter_air.gdml
    A geometry_dose_tests/hybridDaughter_vacuumChamber.gdml
    M geometry_dose_tests/materials.xml
    M src/remollDetectorConstruction.cc

  Log Message:
  -----------
  Merge branch 'develop' of github.com:JeffersonLab/remoll into develop


  Commit: 3fa0a74ef19e3013357d9f62b709012f85935770
      https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_3fa0a74ef19e3013357d9f62b709012f85935770&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=u1ry_rAtaja_vsCwJ3jVQRC479t6AT1X9zaQ55h7gjc&s=3tef_52Zdw_SK6A_sI1_2t4vN5PYv5wZW3OByAl11jE&e= 
  Author: Wouter Deconinck <wdconinc at gmail.com>
  Date:   2018-03-28 (Wed, 28 Mar 2018)

  Changed paths:
    M CMakeLists.txt
    M include/remollBeamTarget.hh
    M include/remollEvent.hh
    M include/remollGenericDetectorHit.hh
    M include/remollGenericDetectorSum.hh
    M include/remollIO.hh
    M include/remollLinkDef.h
    M include/remollSystemOfUnits.hh
    M include/remolltypes.hh
    M src/remollEvent.cc
    M src/remollIO.cc
    A src/remollSystemOfUnits.cc

  Log Message:
  -----------
  Merge branch 'new_io' into integration-new-io

Conflicts resolved mainly due to fEvSeed introduction...


Compare: https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_compare_f7220c0e8712&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=u1ry_rAtaja_vsCwJ3jVQRC479t6AT1X9zaQ55h7gjc&s=J4n9NwyQMcfTOdskMe-ym2OvWhNxua3xymdZ4ittRHE&e= ^...3fa0a74ef19e