diff --git a/.gitmodules b/.gitmodules index efbf34c44..32e5fea11 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,6 +40,9 @@ [submodule "source/libraries/legacy"] path = source/libraries/legacy url = https://github.com/rest-for-physics/legacylib.git +[submodule "source/packages/restDAQ"] + path = source/packages/restDAQ + url = https://github.com/rest-for-physics/restDAQ.git [submodule "projects/trexdm"] path = projects/trexdm url = git@lfna.unizar.es:gifna/trexdm-project.git diff --git a/examples/01.alphaTrack/processing.rml b/examples/01.alphaTrack/processing.rml index b97e1d253..934162e13 100644 --- a/examples/01.alphaTrack/processing.rml +++ b/examples/01.alphaTrack/processing.rml @@ -1,22 +1,13 @@ - + - - - - - - - - - + %options are : essential silent, warning, info, debug - - - - + + + + - @@ -27,90 +18,37 @@ - - - - + + + + + // observable = all will add all NON `custom` observables + - - - + - - - + - // observable = all will add all NON `custom` observables - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + - - - + - - - - - - + - - - - - + - - - + - + - + - - - - - + - - - + - - - - - - + - - - diff --git a/examples/01.alphaTrack/readout/microbulkModule.rml b/examples/01.alphaTrack/readout/microbulkModule.rml index c7d876e98..e2d60cb62 100644 --- a/examples/01.alphaTrack/readout/microbulkModule.rml +++ b/examples/01.alphaTrack/readout/microbulkModule.rml @@ -1,61 +1,23 @@ - + + // Y-strips - - - - - - - - + //First strip is special (upper left corner) - - - - - - - + // Last strip is special - - - - - - - + // X-strips // First strip is special - - - - - - - - - - - - - - - - + + + //Last strip is special (upper left corner) - - - - - - - + - diff --git a/examples/01.alphaTrack/readout/readouts.rml b/examples/01.alphaTrack/readout/readouts.rml index 6af7afe56..16d717483 100644 --- a/examples/01.alphaTrack/readout/readouts.rml +++ b/examples/01.alphaTrack/readout/readouts.rml @@ -1,45 +1,37 @@ - + - + - + - + - - - + - - + - - - - - + + + + - + - - - + - - + - - - - - + + + + - + diff --git a/examples/masks.rml b/examples/masks.rml index 62631a42e..d65ad7d3c 100644 --- a/examples/masks.rml +++ b/examples/masks.rml @@ -47,6 +47,8 @@ +<<<<<<< HEAD +======= @@ -66,4 +68,5 @@ +>>>>>>> 1194199d1179de9f15d0dab11e033b7718b8ac4b diff --git a/examples/metadataPlot.rml b/examples/metadataPlot.rml index 7cf3c5aab..0b8ba27b1 100644 --- a/examples/metadataPlot.rml +++ b/examples/metadataPlot.rml @@ -1,45 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - diff --git a/examples/multiFeminos.rml b/examples/multiFeminos.rml index 95859dc7a..ab701688a 100644 --- a/examples/multiFeminos.rml +++ b/examples/multiFeminos.rml @@ -1,5 +1,4 @@ - - + - - - - - //change this value to "auto" to enable database - + + //change this value to "auto" to enable database + /// from the previously saved metadata file("restManager --c saveMetadataFile.rml --o meta.root") - - - - - - - - - - - - - - - - - - - - - - - - %options are : silent(0), essential(1), info(2), debug(3), extreme(4) - + + + + + + + + + + + + + + + + %options are : silent(0), essential(1), info(2), debug(3), extreme(4) + - - - - - diff --git a/pipeline/pandaxiii_MC/processes_2D.rml b/pipeline/pandaxiii_MC/processes_2D.rml index f36896906..4e0fed300 100644 --- a/pipeline/pandaxiii_MC/processes_2D.rml +++ b/pipeline/pandaxiii_MC/processes_2D.rml @@ -1,4 +1,4 @@ - + @@ -10,25 +10,16 @@ - - - - // fwhm - // absolute gain // parameter name="electronicsGain" - value="671744" // electrons for 4096 ADC units + // fwhm + // absolute gain // parameter name="electronicsGain" value="671744" // electrons for 4096 ADC units - - - - // fwhm - // absolute gain // parameter name="electronicsGain" - value="671744" // electrons for 4096 ADC units + // fwhm + // absolute gain // parameter name="electronicsGain" value="671744" // electrons for 4096 ADC units - @@ -41,18 +32,11 @@ - - - - // Number of sigmas to perform the calculation + // Number of sigmas to perform the calculation - - - // // electrons in each time bin + // // electrons in each time bin - - + @@ -62,7 +46,6 @@ - @@ -70,7 +53,6 @@ - @@ -88,8 +70,7 @@ - + @@ -112,12 +93,9 @@ - - - + + + @@ -198,14 +176,10 @@ - - - - + + + + @@ -214,8 +188,7 @@ - + @@ -227,14 +200,11 @@ - + - - + + @@ -509,9 +479,7 @@ - - //response file to be used - to shape the signal + //response file to be used to shape the signal diff --git a/pipeline/pandaxiii_data/P3AutoChain.rml b/pipeline/pandaxiii_data/P3AutoChain.rml index 4aca52d61..30bc9b5f9 100644 --- a/pipeline/pandaxiii_data/P3AutoChain.rml +++ b/pipeline/pandaxiii_data/P3AutoChain.rml @@ -1,5 +1,4 @@ - - + - - - - - //change this value to "auto" to enable database - - - - - - - - - - - - - - + + //change this value to "auto" to enable database + + + + + + + + + /// We define all observables except MinValue because it is not yet in validation chain - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - diff --git a/pipeline/selection/g4EvSelectionIDsFromFile.rml b/pipeline/selection/g4EvSelectionIDsFromFile.rml index 37be16f15..814aed2e3 100644 --- a/pipeline/selection/g4EvSelectionIDsFromFile.rml +++ b/pipeline/selection/g4EvSelectionIDsFromFile.rml @@ -1,36 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pipeline/trex/02_signal.rml b/pipeline/trex/02_signal.rml index 231a2e194..f3872d6ea 100644 --- a/pipeline/trex/02_signal.rml +++ b/pipeline/trex/02_signal.rml @@ -1,38 +1,17 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 6c0a48a8d..538e25201 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -64,6 +64,10 @@ if (${REST_G4} MATCHES ON) set(RESTLIB_GEANT4 ON) endif () +if( ${REST_DAQ} MATCHES ON ) + set( RESTLIB_RAW ON ) +endif() + if (${RESTLIB_DETECTOR} MATCHES ON) if (${RESTLIB_RAW} MATCHES ON) set(RESTLIB_CONNECTORS ON) diff --git a/source/framework/core/inc/TRestProcessRunner.h b/source/framework/core/inc/TRestProcessRunner.h index 12fa2ae37..0277fa7c7 100644 --- a/source/framework/core/inc/TRestProcessRunner.h +++ b/source/framework/core/inc/TRestProcessRunner.h @@ -39,7 +39,7 @@ class TRestProcessRunner : public TRestMetadata { TFile* fOutputDataFile; //! the TFile pointer being used TString fOutputDataFileName; //! indicates the name of the first file created as output data file. The //! actual output file maybe changed if tree is too large - TTree* fEventTree; //! + TTree* fEventTree; //! TRestAnalysisTree* fAnalysisTree; //! ProcStatus fProcStatus; //! Int_t fNBranches; //! diff --git a/source/framework/test/files/TRestMetadataTest.rml b/source/framework/test/files/TRestMetadataTest.rml index b4c1b8857..ac3b9121f 100644 --- a/source/framework/test/files/TRestMetadataTest.rml +++ b/source/framework/test/files/TRestMetadataTest.rml @@ -1 +1,2 @@ + diff --git a/source/packages/restDAQ b/source/packages/restDAQ new file mode 160000 index 000000000..c5909711c --- /dev/null +++ b/source/packages/restDAQ @@ -0,0 +1 @@ +Subproject commit c5909711c52efe9d9a2ad615594f82c8f43f0aa3