Skip to content

Commit

Permalink
Merge production into production_singleParticle_0-20GeV
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Jan 7, 2022
2 parents d37d30d + accb3d9 commit 55f7479
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/sync-with-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ jobs:
steps:
- uses: actions/checkout@master

- name: Merge production -> production_singleElectron_0-20GeV
uses: devmasx/merge-branch@v1.3.1
with:
type: now
from_branch: production
target_branch: production_singleElectron_0-20GeV
github_token: ${{ github.token }}
#- name: Merge production -> production_singleElectron_0-20GeV
# uses: devmasx/merge-branch@v1.3.1
# with:
# type: now
# from_branch: production
# target_branch: production_singleElectron_0-20GeV
# github_token: ${{ github.token }}

- name: Merge production -> production_singlePion_0-20GeV
uses: devmasx/merge-branch@v1.3.1
with:
type: now
from_branch: production
target_branch: production_singlePion_0-20GeV
github_token: ${{ github.token }}
#- name: Merge production -> production_singlePion_0-20GeV
# uses: devmasx/merge-branch@v1.3.1
# with:
# type: now
# from_branch: production
# target_branch: production_singlePion_0-20GeV
# github_token: ${{ github.token }}

- name: Merge production -> production_pythia8
uses: devmasx/merge-branch@v1.3.1
Expand Down
2 changes: 1 addition & 1 deletion detectors/EICDetector/Fun4All_G4_EICDetector.C
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ int Fun4All_G4_EICDetector(
INPUTGENERATOR::SimpleEventGenerator[0]->set_vertex_distribution_mean(0., 0., 0.);
INPUTGENERATOR::SimpleEventGenerator[0]->set_vertex_distribution_width(0., 0., 5.);
}
INPUTGENERATOR::SimpleEventGenerator[0]->set_eta_range(-3, 3);
INPUTGENERATOR::SimpleEventGenerator[0]->set_eta_range(-4, 4);
INPUTGENERATOR::SimpleEventGenerator[0]->set_phi_range(-M_PI, M_PI);
INPUTGENERATOR::SimpleEventGenerator[0]->set_pt_range(0.1, 20.);
}
Expand Down

0 comments on commit 55f7479

Please sign in to comment.