From 9333c694cd76e840851913138ec55d4e9501d128 Mon Sep 17 00:00:00 2001 From: Valentin Volkl Date: Thu, 4 Jun 2020 14:11:16 +0200 Subject: [PATCH] add github actions config --- .github/scripts/cred-helper.sh | 2 + .github/scripts/gitlabmirror.sh | 65 +++++++++++++++++++ .github/workflows/test.yml | 23 +++++++ .gitlab-ci.yml | 9 +++ Examples/options/geant_fastsim_tklayout.py | 2 +- Jenkinsfile | 22 ------- README.md | 4 +- ..._ReconstructionTopoClusters_electrNoise.py | 6 +- ...nTopoClusters_electrNoise_coneSelection.py | 8 +-- ...ters_electrNoise_fullGran_coneSelection.py | 6 +- ...stem_ReconstructionTopoClusters_noNoise.py | 4 +- ...alSimple_ReconstructionSW_noiseFromFile.py | 2 +- ...oSystem_CorrectECalBarrelSliWinClusters.py | 2 +- ...loSystem_ReconstructionSW_noiseFromFile.py | 6 +- ...econstructionSW_noiseFromFile_resegHCal.py | 4 +- .../tests/options/runPreparePileup.py | 2 +- ...loSystem_ReconstructionSW_noiseFromFile.py | 2 +- .../tests/options/noiseLevelPerCell.py | 2 +- 18 files changed, 125 insertions(+), 46 deletions(-) create mode 100755 .github/scripts/cred-helper.sh create mode 100755 .github/scripts/gitlabmirror.sh create mode 100644 .github/workflows/test.yml create mode 100755 .gitlab-ci.yml delete mode 100644 Jenkinsfile diff --git a/.github/scripts/cred-helper.sh b/.github/scripts/cred-helper.sh new file mode 100755 index 000000000..44d796a3b --- /dev/null +++ b/.github/scripts/cred-helper.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec echo "$GITLAB_PASSWORD" diff --git a/.github/scripts/gitlabmirror.sh b/.github/scripts/gitlabmirror.sh new file mode 100755 index 000000000..69d9e24b1 --- /dev/null +++ b/.github/scripts/gitlabmirror.sh @@ -0,0 +1,65 @@ +#!/bin/bash + +#set -u + +DEFAULT_POLL_TIMEOUT=10 +POLL_TIMEOUT=${POLL_TIMEOUT:-$DEFAULT_POLL_TIMEOUT} + +echo ${GITHUB_REF} +# leave ancient history undisturbed +git fetch --shallow-since=01/01/2020 + +#github_ref +#git checkout "${GITHUB_REF}" + +#branch=${GITHUB_REPOSITORY}/$(git symbolic-ref --short HEAD) +shortbranch=$(git symbolic-ref --short HEAD) + +#git config --global credential.username $GITLAB_USERNAME +#git config --global core.askPass .github/scripts/cred-helper.sh +#git config --global credential.helper cache +#git remote add mirror $GITLAB_URL +#echo pushing to $shortbranch branch at $(git remote get-url --push mirror) +#git push mirror $shortbranch + + +# need a token with api acces +curl --silent --header "PRIVATE-TOKEN: ${GITLAB_PASSWORD2}" -X https://${GITLAB_HOSTNAME}/api/v4/projects/${GITLAB_PROJECT_ID}/mirror/pull + +sleep $POLL_TIMEOUT + + +pipeline_id=$(curl --silent "https://${GITLAB_HOSTNAME}/api/v4/projects/${GITLAB_PROJECT_ID}/repository/commits/${shortbranch}" | jq '.last_pipeline.id') + +echo "Triggered CI for branch ${shortbranch}" +echo "Working with pipeline id #${pipeline_id}" +echo "Poll timeout set to ${POLL_TIMEOUT}" + +ci_status="pending" + +until [[ "$ci_status" != "pending" && "$ci_status" != "running" ]] +do + sleep $POLL_TIMEOUT + ci_output=$(curl --silent "https://${GITLAB_HOSTNAME}/api/v4/projects/${GITLAB_PROJECT_ID}/pipelines/${pipeline_id}") + ci_status=$(jq -n "$ci_output" | jq -r .status) + ci_web_url=$(jq -n "$ci_output" | jq -r .web_url) + + echo "Current pipeline status: ${ci_status}" + if [ "$ci_status" = "running" ] + then + echo "Checking pipeline status..." + curl -d '{"state":"pending", "target_url": "'${ci_web_url}'", "context": "gitlab-ci"}' -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github.antiope-preview+json" -X POST --silent "https://api.github.com/repos/${GITHUB_REPOSITORY}/statuses/${GITHUB_SHA}" > /dev/null + fi +done + +echo "Pipeline finished with status ${ci_status}" + +if [ "$ci_status" = "success" ] +then + curl -d '{"state":"success", "target_url": "'${ci_web_url}'", "context": "gitlab-ci"}' -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github.antiope-preview+json" -X POST --silent "https://api.github.com/repos/${GITHUB_REPOSITORY}/statuses/${GITHUB_SHA}" + exit 0 +elif [ "$ci_status" = "failed" ] +then + curl -d '{"state":"failure", "target_url": "'${ci_web_url}'", "context": "gitlab-ci"}' -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github.antiope-preview+json" -X POST --silent "https://api.github.com/repos/${GITHUB_REPOSITORY}/statuses/${GITHUB_SHA}" + exit 1 +fi diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..f56221a85 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,23 @@ +name: Mirror and run GitLab CI + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Mirror + trigger CI + env: + GITLAB_URL: "https://gitlab.cern.ch/vavolkl/FCCSW" + GITLAB_HOSTNAME: "gitlab.cern.ch" + GITLAB_USERNAME: "vavolkl" + GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }} + GITLAB_PASSWORD2: ${{ secrets.GITLAB_PASSWORD2 }} + GITLAB_PROJECT_ID: 93907 + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + POLL_TIMEOUT: 25 + run: | + ls -alh + git status + ./.github/scripts/gitlabmirror.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100755 index 000000000..21da7fc55 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,9 @@ +# the git version on centos7 is too old for fetch +variables: + GIT_STRATEGY: clone + +build-all: + script: + - source init.sh + - mkdir build; cd build; cmake ..; make -j `getconf _NPROCESSORS_ONLN` + - ctest -j `getconf _NPROCESSORS_ONLN` diff --git a/Examples/options/geant_fastsim_tklayout.py b/Examples/options/geant_fastsim_tklayout.py index fe1fed571..bb1eb6aa9 100644 --- a/Examples/options/geant_fastsim_tklayout.py +++ b/Examples/options/geant_fastsim_tklayout.py @@ -45,7 +45,7 @@ from GaudiKernel.SystemOfUnits import GeV, TeV # create particle smearing tool, used for smearing in the tracker smeartool = SimG4ParticleSmearRootFile("Smear") -smeartool.filename = "root://eosuser.cern.ch//eos/project/f/fccsw-web/testsamples/tkLayout_example_resolutions.root" +smeartool.filename = "http://fccsw.web.cern.ch/fccsw/testsamples/tkLayout_example_resolutions.root" ## create region and a parametrisation model, pass smearing tool regiontool = SimG4FastSimTrackerRegion("model", volumeNames=["TrackerEnvelopeBarrel"], minMomentum = 5*GeV, maxMomentum = 10*TeV, maxEta=6, smearing=smeartool) diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 3f5f682eb..000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,22 +0,0 @@ -pipeline { - agent any - - stages { - stage('Build') { - steps { - sh "mkdir build || true; cd build && cmake .. && make;" - } - } - stage('Test') { - steps { - echo 'Testing..' - sh "cd build && make test" - } - } - stage('Deploy') { - steps { - echo 'Deploying.... (skip)' - } - } - } -} diff --git a/README.md b/README.md index 552fdafb8..cbabb1aba 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,11 @@ Common software for all FCC experiments. This software is based on Gaudi. + Installation ------------ + Log in to lxplus (CentOS7). Please note that these instructions might not work on another CentOS7 machine. Clone your fork of this repository: @@ -33,7 +35,7 @@ Test ---- ~~~{.sh} -./run fccrun.py Examples/options/example_options.py +./run fccrun Examples/options/example_options.py ~~~ you can also specify some options like number of events and output file diff --git a/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise.py b/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise.py index 98c0671dc..9ae64975b 100644 --- a/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise.py +++ b/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise.py @@ -16,7 +16,7 @@ num_events = 3 #Geometry details to add noise to every Calo cell and paths to root files that have the noise const per cell -ecalBarrelNoisePath = "/eos/project/f/fccsw-web/testsamples/elecAndPileupNoise_ecalBarrel_50Ohm_traces2_2shieldWidth.root" +ecalBarrelNoisePath = "http://fccsw.web.cern.ch/fccsw/testsamples/elecAndPileupNoise_ecalBarrel_50Ohm_traces2_2shieldWidth.root" ecalBarrelNoiseHistName ="h_elecNoise_fcc_" #active material identifier name hcalIdentifierName = [ "module", "row", "layer" ] @@ -179,12 +179,12 @@ createTopoInput.hcalFwdCells.Path = "emptyCaloCells" readNeighboursMap =TopoCaloNeighbours("ReadNeighboursMap", - fileName = "/eos/project/f/fccsw-web/testsamples/calo/neighbours_map_barrel.root", + fileName = "http://fccsw.web.cern.ch/fccsw/testsamples/calo/neighbours_map_barrel.root", OutputLevel = DEBUG) #Noise levels per cell readNoisyCellsMap = TopoCaloNoisyCells("ReadNoisyCellsMap", - fileName = "/eos/project/f/fccsw-web/testsamples/calo/cellNoise_map_electronicsNoiseLevel.root", + fileName = "http://fccsw.web.cern.ch/fccsw/testsamples/calo/cellNoise_map_electronicsNoiseLevel.root", OutputLevel = DEBUG) createTopoClusters = CaloTopoCluster("CreateTopoClusters", diff --git a/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_coneSelection.py b/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_coneSelection.py index 420989872..79d0e48ae 100644 --- a/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_coneSelection.py +++ b/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_coneSelection.py @@ -16,7 +16,7 @@ num_events = 3 #Geometry details to add noise to every Calo cell and paths to root files that have the noise const per cell -ecalBarrelNoisePath = "root://eosuser.cern.ch//eos/project/f/fccsw-web/testsamples/elecNoise_ecalBarrel_50Ohm_traces2_2shieldWidth_noise.root" +ecalBarrelNoisePath = "http://fccsw.web.cern.ch/fccsw/testsamples/elecNoise_ecalBarrel_50Ohm_traces2_2shieldWidth_noise.root" ecalBarrelNoiseHistName ="h_elecNoise_fcc_" #active material identifier name hcalIdentifierName = [ "module", "row", "layer" ] @@ -187,13 +187,13 @@ createTopoInput.hcalFwdCells.Path = "emptyCaloCells" readNeighboursMap =TopoCaloNeighbours("ReadNeighboursMap", - fileName = "/eos/project/f/fccsw-web/testsamples/calo/neighbours_map_barrel.root", + fileName = "http://fccsw.web.cern.ch/fccsw/testsamples/calo/neighbours_map_barrel.root", OutputLevel = DEBUG) #Noise levels per cell readNoisyCellsMap = TopoCaloNoisyCells("ReadNoisyCellsMap", -# fileName = "/eos/project/f/fccsw-web/testsamples/calo/cellNoise_map_electronicsNoiseLevel.root", - fileName = "/eos/project/f/fccsw-web/testsamples/calo/cellNoise_map_segHcal_electronicsNoiseLevel.root", +# fileName = "http://fccsw.web.cern.ch/fccsw/testsamples/calo/cellNoise_map_electronicsNoiseLevel.root", + fileName = "http://fccsw.web.cern.ch/fccsw/testsamples/calo/cellNoise_map_segHcal_electronicsNoiseLevel.root", OutputLevel = DEBUG) createTopoClusters = CaloTopoCluster("CreateTopoClusters", diff --git a/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_fullGran_coneSelection.py b/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_fullGran_coneSelection.py index 797dad818..973ad567e 100644 --- a/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_fullGran_coneSelection.py +++ b/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_fullGran_coneSelection.py @@ -200,13 +200,13 @@ readNeighboursMap =TopoCaloNeighbours("ReadNeighboursMap", #fileName = "/afs/cern.ch/work/c/cneubuse/public/FCChh/neighbours_map_barrel.root", - fileName = "neighbours_map_fullGran_barrel.root", #/eos/project/f/fccsw-web/testsamples/calo/neighbours_map_barrel.root", + fileName = "neighbours_map_fullGran_barrel.root", #http://fccsw.web.cern.ch/fccsw/testsamples/calo/neighbours_map_barrel.root", OutputLevel = DEBUG) #Noise levels per cell readNoisyCellsMap = TopoCaloNoisyCells("ReadNoisyCellsMap", - fileName = "/eos/project/f/fccsw-web/testsamples/calo/cellNoise_map_electronicsNoiseLevel.root", -# fileName = "/eos/project/f/fccsw-web/testsamples/calo/cellNoise_map_segHcal_electronicsNoiseLevel.root", + fileName = "http://fccsw.web.cern.ch/fccsw/testsamples/calo/cellNoise_map_electronicsNoiseLevel.root", +# fileName = "http://fccsw.web.cern.ch/fccsw/testsamples/calo/cellNoise_map_segHcal_electronicsNoiseLevel.root", OutputLevel = DEBUG) createTopoClusters = CaloTopoCluster("CreateTopoClusters", diff --git a/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_noNoise.py b/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_noNoise.py index 353f4b77a..e0a615b74 100644 --- a/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_noNoise.py +++ b/Reconstruction/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_noNoise.py @@ -81,14 +81,14 @@ createTopoInput.hcalFwdCells.Path = "emptyCaloCells" readNeighboursMap =TopoCaloNeighbours("ReadNeighboursMap", - fileName = "/eos/project/f/fccsw-web/testsamples/calo/neighbours_map_segHcal.root", + fileName = "http://fccsw.web.cern.ch/fccsw/testsamples/calo/neighbours_map_segHcal.root", OutputLevel = DEBUG) #Thresholds estimated from atlas, without noise !!! readNoisyCellsMap = TopoCaloNoisyCells( "ReadNoisyCellsMap", fileName = - "/eos/project/f/fccsw-web/testsamples/calo/cellNoise_map_segHcal_constNoiseLevel.root", + "http://fccsw.web.cern.ch/fccsw/testsamples/calo/cellNoise_map_segHcal_constNoiseLevel.root", OutputLevel = DEBUG) createTopoClusters = CaloTopoCluster("CreateTopoClusters", diff --git a/Reconstruction/RecCalorimeter/tests/options/runEcalSimple_ReconstructionSW_noiseFromFile.py b/Reconstruction/RecCalorimeter/tests/options/runEcalSimple_ReconstructionSW_noiseFromFile.py index dae2377f0..214ff62bf 100644 --- a/Reconstruction/RecCalorimeter/tests/options/runEcalSimple_ReconstructionSW_noiseFromFile.py +++ b/Reconstruction/RecCalorimeter/tests/options/runEcalSimple_ReconstructionSW_noiseFromFile.py @@ -51,7 +51,7 @@ calibcells = CalibrateCaloHitsTool("CalibrateCaloHitsTool", invSamplingFraction="5.4") noise = NoiseCaloCellsFromFileTool("NoiseCaloCellsFromFileTool", cellPositionsTool=dummyCells, - noiseFileName="root://eosuser.cern.ch//eos/project/f/fccsw-web/testsamples/fcc_ecalCellNoise_mu1000_3radialLayers_v1.root") + noiseFileName="http://fccsw.web.cern.ch/fccsw/testsamples/fcc_ecalCellNoise_mu1000_3radialLayers_v1.root") ecalgeo = TubeLayerPhiEtaCaloTool("EcalGeo", readoutName = ecalReadoutName, diff --git a/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_CorrectECalBarrelSliWinClusters.py b/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_CorrectECalBarrelSliWinClusters.py index 2889ebd88..e3aa761ea 100644 --- a/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_CorrectECalBarrelSliWinClusters.py +++ b/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_CorrectECalBarrelSliWinClusters.py @@ -90,7 +90,7 @@ vertex = "GenVertices", nPhiOptimFinal = [7]*8, nEtaOptimFinal = [19]*8, - noiseFileName = "root://eosuser.cern.ch//eos/project/f/fccsw-web/testsamples/elecNoise_pileup_cluster_mu200_700files.root") + noiseFileName = "http://fccsw.web.cern.ch/fccsw/testsamples/elecNoise_pileup_cluster_mu200_700files.root") THistSvc().Output = ["rec DATAFILE='clusterCorrections_histograms.root' TYP='ROOT' OPT='RECREATE'"] THistSvc().PrintAll=True diff --git a/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py b/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py index ea28af6ae..ac63688bf 100644 --- a/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py +++ b/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py @@ -38,7 +38,7 @@ from Configurables import FCCDataSvc podioevent = FCCDataSvc("EventDataSvc") # produced with Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation.py -podioevent.input="root://eosuser.cern.ch//eos/project/f/fccsw-web/testsamples/output_fullCalo_SimAndDigi_e50GeV_3events.root" +podioevent.input="http://fccsw.web.cern.ch/fccsw/testsamples/output_fullCalo_SimAndDigi_e50GeV_3events.root" ApplicationMgr().ExtSvc += [podioevent] @@ -174,7 +174,7 @@ from Configurables import NoiseCaloCellsFromFileTool noiseBarrel = NoiseCaloCellsFromFileTool("NoiseBarrel") noiseBarrel.readoutName = ecalBarrelReadoutName -noiseBarrel.noiseFileName = "root://eosuser.cern.ch//eos/project/f/fccsw-web/testsamples/elecNoise_ecalBarrel_50Ohm_traces2_2shieldWidth.root" +noiseBarrel.noiseFileName = "http://fccsw.web.cern.ch/fccsw/testsamples/elecNoise_ecalBarrel_50Ohm_traces2_2shieldWidth.root" noiseBarrel.elecNoiseHistoName = "h_elecNoise_fcc_" noiseBarrel.activeFieldName = "layer" noiseBarrel.addPileup = False @@ -206,7 +206,7 @@ from Configurables import NoiseCaloCellsFromFileTool noiseEndcap = NoiseCaloCellsFromFileTool("NoiseEndcap") noiseEndcap.readoutName = ecalEndcapReadoutName -noiseEndcap.noiseFileName = "root://eosuser.cern.ch//eos/project/f/fccsw-web/testsamples/elecNoise_emec_50Ohm_2shieldWidth_6layers.root" +noiseEndcap.noiseFileName = "http://fccsw.web.cern.ch/fccsw/testsamples/elecNoise_emec_50Ohm_2shieldWidth_6layers.root" noiseEndcap.elecNoiseHistoName = "h_elecNoise_fcc_" noiseEndcap.activeFieldName = "layer" noiseEndcap.addPileup = False diff --git a/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile_resegHCal.py b/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile_resegHCal.py index d6c075823..809475387 100644 --- a/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile_resegHCal.py +++ b/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile_resegHCal.py @@ -42,8 +42,8 @@ OutputLevel = WARNING) -ecalBarrelNoisePath = "/eos/project/f/fccsw-web/testsamples/elecNoise_ecalBarrel_50Ohm_traces2_2shieldWidth.root" -ecalEndcapNoisePath = "/eos/project/f/fccsw-web/testsamples/elecNoise_emec_50Ohm_2shieldWidth_6layers.root" +ecalBarrelNoisePath = "http://fccsw.web.cern.ch/fccsw/testsamples/elecNoise_ecalBarrel_50Ohm_traces2_2shieldWidth.root" +ecalEndcapNoisePath = "http://fccsw.web.cern.ch/fccsw/testsamples/elecNoise_emec_50Ohm_2shieldWidth_6layers.root" ecalBarrelNoiseHistName = "h_elecNoise_fcc_" ecalEndcapNoiseHistName = "h_elecNoise_fcc_" diff --git a/Reconstruction/RecCalorimeter/tests/options/runPreparePileup.py b/Reconstruction/RecCalorimeter/tests/options/runPreparePileup.py index d6ff29daf..2acd011af 100644 --- a/Reconstruction/RecCalorimeter/tests/options/runPreparePileup.py +++ b/Reconstruction/RecCalorimeter/tests/options/runPreparePileup.py @@ -3,7 +3,7 @@ from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput # v01 production - min. bias events -podioevent = FCCDataSvc("EventDataSvc", input="/eos/project/f/fccsw-web/testsamples/caloCells_minBiasEvent.root") +podioevent = FCCDataSvc("EventDataSvc", input="http://fccsw.web.cern.ch/fccsw/testsamples/caloCells_minBiasEvent.root") # reads HepMC text file and write the HepMC::GenEvent to the data service from Configurables import PodioInput diff --git a/Reconstruction/RecFCCeeCalorimeter/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py b/Reconstruction/RecFCCeeCalorimeter/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py index 85cab9f07..a0ac4ce84 100644 --- a/Reconstruction/RecFCCeeCalorimeter/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py +++ b/Reconstruction/RecFCCeeCalorimeter/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py @@ -51,7 +51,7 @@ geoservice.OutputLevel = WARNING -ecalBarrelNoisePath = "root://eosuser.cern.ch//eos/project/f/fccsw-web/testsamples/elecNoise_ecalBarrelFCCee_50Ohm_traces1_4shieldWidth.root" +ecalBarrelNoisePath = "http://fccsw.web.cern.ch/fccsw/testsamples/elecNoise_ecalBarrelFCCee_50Ohm_traces1_4shieldWidth.root" ecalEndcapNoisePath = "elecNoise_emec_50Ohm_2shieldWidth_6layers.root" ecalBarrelNoiseHistName = "h_elecNoise_fcc_" ecalEndcapNoiseHistName = "h_elecNoise_fcc_" diff --git a/Reconstruction/RecFCChhCalorimeter/tests/options/noiseLevelPerCell.py b/Reconstruction/RecFCChhCalorimeter/tests/options/noiseLevelPerCell.py index 0533f26af..7db8b41e4 100644 --- a/Reconstruction/RecFCChhCalorimeter/tests/options/noiseLevelPerCell.py +++ b/Reconstruction/RecFCChhCalorimeter/tests/options/noiseLevelPerCell.py @@ -12,7 +12,7 @@ hcalBarrelReadoutName = "BarHCal_Readout_phieta" # noise files # has HCal electr. noise levels as well as ECal electr. noise level -BarrelNoisePath = "/eos/project/f/fccsw-web/testsamples/noiseBarrel_PU200.root" +BarrelNoisePath = "http://fccsw.web.cern.ch/fccsw/testsamples/noiseBarrel_PU200.root" ecalBarrelNoiseHistName = "h_elecNoise_fcc_" hcalBarrelNoiseHistName = "h_elec_hcal_layer"