diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c72c5b07a1..907516a5c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -248,7 +248,7 @@ jobs: tar xzf coatjava.tar.gz - run: ls - name: run test - run: ./bin/run-clara -y ./etc/services/rgd-clarode.yml -t 4 -n 500 -c ./clara -o ./tmp ./clas_018779.evio.00001 + run: ./bin/run-clara -y ./etc/services/data-ai.yaml -t 4 -n 500 -c ./clara -o ./tmp ./clas_018779.evio.00001 - name: ls tmp run: ls -lhtr tmp - name: rename diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d5fef4dcb..9ca4518b79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,16 +172,16 @@ clara: dependencies: [build,download] script: - tar -xzf clara.tar.gz - - run-clara -v -c $CLARA_HOME -t 4 -y ./etc/services/rgd-clarode.yml -n 30 -o out $EVIOFILE + - run-clara -v -c $CLARA_HOME -t 4 -y ./etc/services/data-ai.yaml -n 30 -o out $EVIOFILE - mv out/rec_$EVIOFILE.hipo claroded.hipo profile: extends: .clon allow_failure: true script: - - ./clara/plugins/clas12/libexec/profile -e cpu -o _clara -- run-clara -c ./clara -y ./etc/services/rgd-clarode.yml -o tmp1 -t 16 -l $EVIOFILE - - ./clara/plugins/clas12/libexec/profile -e alloc -o _clara -- run-clara -c ./clara -y ./etc/services/rgd-clarode.yml -o tmp2 -t 16 -l $EVIOFILE - - ./clara/plugins/clas12/libexec/profile -e lock -o _clara -- run-clara -c ./clara -y ./etc/services/rgd-clarode.yml -o tmp3 -t 16 -l $EVIOFILE + - ./clara/plugins/clas12/libexec/profile -e cpu -o _clara -- run-clara -c ./clara -y ./etc/services/data-ai.yaml -o tmp1 -t 16 -l $EVIOFILE + - ./clara/plugins/clas12/libexec/profile -e alloc -o _clara -- run-clara -c ./clara -y ./etc/services/data-ai.yaml -o tmp2 -t 16 -l $EVIOFILE + - ./clara/plugins/clas12/libexec/profile -e lock -o _clara -- run-clara -c ./clara -y ./etc/services/data-ai.yaml -o tmp3 -t 16 -l $EVIOFILE artifacts: when: always expire_in: 1 week @@ -192,7 +192,7 @@ scaling: extends: .clon allow_failure: true script: - - ./clara/plugins/clas12/libexec/scaling -c ./clara -y ./etc/services/rgd-clarode.yml -t 8,12,18,24 $EVIOFILE + - ./clara/plugins/clas12/libexec/scaling -c ./clara -y ./etc/services/data-ai.yaml -t 8,12,18,24 $EVIOFILE artifacts: when: always expire_in: 1 week diff --git a/etc/services/rgd-clarode.yml b/etc/services/rgd-clarode.yml deleted file mode 100644 index 1f5e638fb1..0000000000 --- a/etc/services/rgd-clarode.yml +++ /dev/null @@ -1,88 +0,0 @@ -mime-types: - - binary/data-hipo -configuration: - global: - dcrbJitter: "true" - variation: rgd_fall2023 - io-services: - writer: - schema_dir: dst - schema_prescale: 100 - rawTriggerMask: 0x8000000000 - rawTriggerPrescale: 0 - services: - MAGFIELDS: - magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat - magfieldTorusMap: Full_torus_r251_phi181_z251_25Jan2021.dat - DCCR: - rawBankGroup: "NOISE1" - MLTD: - run: "18305" - DCHAI: - outputBankPrefix: "HB" -io-services: - reader: - class: org.jlab.io.clara.Clas12Reader - name: Clas12Reader - writer: - class: org.jlab.io.clara.Clas12Writer - name: Clas12Writer -services: - - class: org.jlab.clas.reco.DecoderEngine - name: DECO - - class: org.jlab.service.ai.DCDenoiseEngine - name: DCDN - - class: org.jlab.clas.swimtools.MagFieldsEngine - name: MAGFIELDS - - class: org.jlab.rec.ft.cal.FTCALEngine - name: FTCAL - - class: org.jlab.rec.ft.hodo.FTHODOEngine - name: FTHODO - - class: org.jlab.rec.ft.trk.FTTRKEngine - name: FTTRK - - class: org.jlab.rec.ft.FTEBEngine - name: FTEB - - class: org.jlab.service.raster.RasterEngine - name: RASTER - - class: org.jlab.service.dc.DCHBClustering - name: DCCR - - class: org.jlab.service.mltn.MLTDEngine - name: MLTD - - class: org.jlab.service.dc.DCHBPostClusterAI - name: DCHAI - - class: org.jlab.service.ftof.FTOFHBEngine - name: FTOFHB - - class: org.jlab.service.ec.ECEngine - name: EC - - class: org.jlab.rec.cvt.services.CVTEngine - name: CVTFP - - class: org.jlab.service.ctof.CTOFEngine - name: CTOF - - class: org.jlab.service.cnd.CNDCalibrationEngine - name: CND - - class: org.jlab.service.band.BANDEngine - name: BAND - - class: org.jlab.service.htcc.HTCCReconstructionService - name: HTCC - - class: org.jlab.service.ltcc.LTCCEngine - name: LTCC - - class: org.jlab.service.eb.EBHBEngine - name: EBHB - - class: org.jlab.service.dc.DCTBEngine - name: DCTB - - class: org.jlab.service.fmt.FMTEngine - name: FMT - - class: org.jlab.rec.cvt.services.CVTSecondPassEngine - name: CVTSP - - class: org.jlab.service.ftof.FTOFTBEngine - name: FTOFTB - - class: org.jlab.service.eb.EBTBEngine - name: EBTB - - class: org.jlab.rec.rich.RICHEBEngine - name: RICH - - class: org.jlab.service.rtpc.RTPCEngine - name: RTPC - - class: org.jlab.rec.service.vtx.VTXEngine - name: VTX - - class: org.jlab.calibration.service.CalibBanksEngine - name: CALIB diff --git a/etc/services/rgl-clarode.yml b/etc/services/rgl-clarode.yml deleted file mode 100644 index 9c92b0a1d2..0000000000 --- a/etc/services/rgl-clarode.yml +++ /dev/null @@ -1,66 +0,0 @@ -io-services: - reader: - class: org.jlab.io.clara.Clas12Reader - name: Clas12Reader - writer: - class: org.jlab.io.clara.Clas12Writer - name: Clas12Writer -services: - - class: org.jlab.clas.reco.DecoderEngine - name: DECO - - class: org.jlab.clas.swimtools.MagFieldsEngine - name: MAGFIELDS - - class: org.jlab.rec.ft.cal.FTCALEngine - name: FTCAL - - class: org.jlab.rec.ft.hodo.FTHODOEngine - name: FTHODO - - class: org.jlab.rec.ft.FTEBEngine - name: FTEB - - class: org.jlab.service.ai.DCDenoiseEngine - name: DCDN - - class: org.jlab.service.dc.DCHBClustering - name: DCCR - - class: org.jlab.service.dc.DCHBPostClusterConv - name: DCHB - - class: org.jlab.service.ftof.FTOFHBEngine - name: FTOFHB - - class: org.jlab.service.ec.ECEngine - name: EC - - class: org.jlab.service.ctof.CTOFEngine - name: CTOF - - class: org.jlab.service.cnd.CNDCalibrationEngine - name: CND - - class: org.jlab.service.band.BANDEngine - name: BAND - - class: org.jlab.service.htcc.HTCCReconstructionService - name: HTCC - - class: org.jlab.service.ltcc.LTCCEngine - name: LTCC - - class: org.jlab.service.eb.EBHBEngine - name: EBHB - - class: org.jlab.service.dc.DCTBEngine - name: DCTB - - class: org.jlab.service.ftof.FTOFTBEngine - name: FTOFTB - - class: org.jlab.service.eb.EBTBEngine - name: EBTB - - class: org.jlab.rec.rich.RICHEBEngine - name: RICH - - class: org.jlab.service.atof.ATOFEngine - name: ATOF - - class: org.jlab.service.ahdc.AHDCEngine - name: AHDC -configuration: - global: - variation: rgl_spring2025 - io-services: - writer: - schema_dir: dst - services: - MAGFIELDS: - magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat - magfieldTorusMap: Full_torus_r251_phi181_z251_25Jan2021.dat - AHDC: - Mode: "AI_Track_Finding" -mime-types: - - binary/data-hipo