From 7940f1cd95711237efff6bfe3fa3d2f89ff1b4df Mon Sep 17 00:00:00 2001 From: "Ryan@SOLARIS_testStation" Date: Wed, 29 May 2024 14:47:44 -0400 Subject: [PATCH] update README.md --- README.md | 9 +-------- mapping.h | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 970e7ac..e6811e5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ Codes need to be compiled are in armory/ # Function of Programs ![Alt text](armory/programs_explain.png?raw=true "program explained") - # armory/DataBlock.h this is the source file for the class DataBlock, it stored all information from a single data block from pixie16 output. @@ -18,11 +17,8 @@ this is the source file for the class evtReader. It read the *.evt file (which is same as pixie16 output) and convert each measurement (or data block) from byte into meaningful data and use DataBlock class to store the information. It can also scan the evt file. -# armory/MergeEVT -this merges all evt files into *_raw.root. - # armory/EventBuilder -this builds events from *_raw,root to *.root file +This builds events from *.evt files to *.root file. It by pass the *.to file. the default BUFFERSIZE is 1 million datablock. # armory/evt2hist this processes evt file to hstograms. @@ -34,9 +30,6 @@ this build events from *.evt.to files to *.root file (need to check the compacta this sorting the time from *evt file to *.evt.to.fsu.XXX, where XXX is the time window. It will search data within XXX time window, if non of the data is from clover, discard. -# armory/xia2root -this is old evt to root for custom pixie DAQ. - # Analyzer.C/h this is a TSelector for analysis the *.root file diff --git a/mapping.h b/mapping.h index 140e219..d0b210e 100644 --- a/mapping.h +++ b/mapping.h @@ -16,18 +16,22 @@ ZERO DEGREE : 300 - 399 #define NGAGG 26 #define NZEROGAGG 2 ///NZERO is used -// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 -int mapping[176] ={ 0, 1, 2, 3, 100, 4, 5, 6, 7, 101, 8, 9, 10, 11, 102, -1, //mod-0 - 12, 13, 14, 15, 103, 16, 17, 18, 19, 104, 20, 21, 22, 23, 105, -1, //mod-1 - 24, 25, 26, 27, 106, 28, 29, 30, 31, 107, 32, 33, 34, 35, 108, -1, //mod-2 - 36, 37, 38, 39, 109, 40, 41, 42, 43, 110, 300, 301, 200, 201, 202, 203, //mod-3 - 204, 205, 206, 207, 208, 209, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, //mod-4 - 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, //mod-5, Ring 4A - 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, //mod-6, Ring 4B - -1, -1, -1, -1, 4, 5, -1, -1, 8, 9, -1, -1, -1, -1, -1, -1, //mod-7 - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //mod-8 - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //mod-9 - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; //mod-10 +int mapping[176] ={ +//***************** <-- load indicator +// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + 0, 1, 2, 3, 100, 4, 5, 6, 7, 101, 8, 9, 10, 11, 102, -1, //mod-0 + 12, 13, 14, 15, 103, 16, 17, 18, 19, 104, 20, 21, 22, 23, 105, -1, //mod-1 + 24, 25, 26, 27, 106, 28, 29, 30, 31, 107, 32, 33, 34, 35, 108, -1, //mod-2 + 36, 37, 38, 39, 109, 40, 41, 42, 43, 110, 300, 301, 200, 201, 202, 203, //mod-3 + 204, 205, 206, 207, 208, 209, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, //mod-4 + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, //mod-5, Ring 4A + 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, //mod-6, Ring 4B + -1, -1, -1, -1, 4, 5, -1, -1, 8, 9, -1, -1, -1, -1, -1, -1, //mod-7 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //mod-8 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //mod-9 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 //mod-10 +//&*************** <-- end of mapping indicator +}; //200- 209 GAGG 2A //210- 225 GAGG 4A