From 328e32662c72f86735bf5e653bbe3acadc9b342c Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Mon, 18 Sep 2023 12:14:29 +0200 Subject: [PATCH] added MC::RecMatch and MC::GenMatch to the dst schema, created dcalign schema, updated yamls --- etc/bankdefs/util/bankSplit.py | 9 +++++++-- etc/services/dcalign.yaml | 4 +--- etc/services/denoise.yaml | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/etc/bankdefs/util/bankSplit.py b/etc/bankdefs/util/bankSplit.py index 83cb47b7a..e0be9398d 100644 --- a/etc/bankdefs/util/bankSplit.py +++ b/etc/bankdefs/util/bankSplit.py @@ -48,7 +48,7 @@ def create(dirname, banklist): print("Single json files saved in " + workdirectory + singledirectory) # these should *always* be kept: -mc = ["MC::Event", "MC::Header", "MC::Lund", "MC::Particle", "MC::True"] +mc = ["MC::Event", "MC::GenMatch", "MC::Header", "MC::Lund", "MC::Particle", "MC::RecMatch", "MC::True"] tag1 = ["RUN::config", "RAW::epics", "RAW::scaler", "RUN::scaler", "COAT::config", "HEL::flip", "HEL::online"] # these are the output of the event builder: @@ -84,14 +84,19 @@ def create(dirname, banklist): ebrerun = list(dst) ebrerun.extend(["FTOF::clusters","FTOF::hbclusters","TimeBasedTrkg::TBTracks","TimeBasedTrkg::Trajectory","TimeBasedTrkg::TBCovMat","HitBasedTrkg::HBTracks","HitBasedTrkg::Trajectory","ECAL::clusters","ECAL::calib","CTOF::clusters","CND::clusters","HTCC::rec","LTCC::clusters","ECAL::moments","CVTRec::Tracks","CVTRec::Trajectory","FT::particles","FTCAL::clusters","FTHODO::clusters","RUN::rf"]) -# EC rerun schema adds ECAL raw banks to the EB rerun scehma: +# EC rerun schema adds ECAL raw banks to the EB rerun schema: ecrerun = list(ebrerun) ecrerun.extend(["ECAL::tdc","ECAL::adc"]) +# DC alignment and AI-tracking validation schema: +dcalign = list(dst) +dcalign.extend(["ai::tracks", "aidn::tracks", "TimeBasedTrkg::AIClusters", "TimeBasedTrkg::AIHits", "TimeBasedTrkg::AITracks", "TimeBasedTrkg::TBClusters", "TimeBasedTrkg::TBHits", "TimeBasedTrkg::TBTracks"]) + create("dst/", set(dst)) create("dsthb/", set(dsthb)) create("calib/", set(calib)) create("mon/", set(mon)) create("ebrerun/", set(ebrerun)) create("ecrerun/", set(ecrerun)) +create("dcalign/", set(dcalign)) diff --git a/etc/services/dcalign.yaml b/etc/services/dcalign.yaml index d36ca12dc..2e90ebe9a 100644 --- a/etc/services/dcalign.yaml +++ b/etc/services/dcalign.yaml @@ -57,9 +57,7 @@ configuration: # timestamp: 12/31/2020-00:00:00 # io-services: # writer: -# schema_dir: "absolute-path-to-schema-folder" -# for example: -# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst" +# schema_dir: "absolute-path-to-distribution/etc/bankdefs/hipo4/singles/dcalign" services: MAGFIELDS: magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat diff --git a/etc/services/denoise.yaml b/etc/services/denoise.yaml index a3569bb24..6d0c5b046 100644 --- a/etc/services/denoise.yaml +++ b/etc/services/denoise.yaml @@ -91,7 +91,7 @@ configuration: rawBankGroup: "NODENOISE" DCRAI: #rawBankGroup: "DEFAULT" - #rawBankGroup: "NODENOISE" + rawBankGroup: "NOISE1" outputBankPrefix: "DN" MLTD: run: "6302"