Merge branch 'master' into alphaAna

rest-for-physics · Apr 20, 2022 · 46d6a36 · 46d6a36
2 parents 3c031f9 + bdc0641
commit 46d6a36
Show file tree

Hide file tree

Showing 85 changed files with 1,170 additions and 1,122 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,6 +1,6 @@
 Please, REMOVE this text! This is just a template to serve as a reminder.
 
-Please, give as much details as possible at your PR and create the simplest possible PR to facilitate reviewing.
+Please, give as much detail as possible at your PR and create the simplest possible PR to facilitate reviewing.
 
 If your PR fixes a given issue, please specify the number followed by #
 
@@ -21,6 +21,6 @@ Reminder: Please, new features and upgrades should be sufficiently documented an
 
 Reminder: Adding this to your PR description will notify members at the core_dev team: @rest-for-physics/core_dev
 
-Reminder: When writting your PR description remember to leave any necessary instructions to test the new implementation.
+Reminder: When writing your PR description remember to leave any necessary instructions to test the new implementation.
 
 Reminder: to set-up the PR in the draft state when there is still work in progress, and make it ready once all pipelines have suceeded.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -75,7 +75,7 @@ Validate Code:
   stage: pre-build
   script:
     - cd ${CI_PROJECT_DIR}/
-    - python3 pull-submodules.py --force --dontask
+    - python3 pull-submodules.py --force --dontask --latest:${CI_COMMIT_BRANCH}
     - python3 pipeline/validateProcesses.py source/libraries/
 
 Build and Test:

diff --git a/doc/userguide b/doc/userguide
diff --git a/macros/REST_CheckRunFileList.C b/macros/REST_CheckRunFileList.C
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <vector>
+
 #include "TGeoManager.h"
 #include "TRestTask.h"
 #include "TSystem.h"

diff --git a/macros/REST_PrintDataBase.C b/macros/REST_PrintDataBase.C
@@ -1,9 +1,11 @@
 #include <iostream>
 #include <string>
+
 #include "TRestTask.h"
 using namespace std;
 
 #include <TString.h>
+
 #include "TRestDataBase.h"
 
 #ifndef RestTask_DataBase

diff --git a/macros/REST_PrintFileContents.C b/macros/REST_PrintFileContents.C
@@ -4,6 +4,7 @@
 #include <TRestTools.h>
 #include <TRint.h>
 #include <TSystem.h>
+
 #include "TRestTask.h"
 
 #ifndef RESTTask_PrintFileContents

diff --git a/macros/REST_PrintTrees.C b/macros/REST_PrintTrees.C
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <string>
+
 #include "TRestTask.h"
 using namespace std;
 

diff --git a/macros/REST_SendMessage.C b/macros/REST_SendMessage.C
@@ -17,7 +17,6 @@
 //***
 //*******************************************************************************************************
 Int_t REST_SendMessage(int token, TString message) {
-
     TRestMessenger m(token);
 
     m.SendMessage((string)message);

diff --git a/pipeline/metadata/readout/PrintReadout.C b/pipeline/metadata/readout/PrintReadout.C
@@ -1,6 +1,7 @@
 #include <fstream>
 #include <iostream>
 #include <string>
+
 #include "TRestDetectorReadout.h"
 #include "TRestTask.h"
 

diff --git a/pipeline/selection/Validate.C b/pipeline/selection/Validate.C
@@ -1,5 +1,6 @@
 #include <TFile.h>
 #include <TTree.h>
+
 #include <iostream>
 #include <vector>
 Int_t Validate(TString fname) {

diff --git a/projects/basic-geometries b/projects/basic-geometries
diff --git a/projects/basic-readouts b/projects/basic-readouts
+3 −0		GenerateReadouts.C
+10 −5		README.md
+8 −8		ReadoutTest.C
+ −		images/microbulk.pdf
+ −		images/microbulk.png
+ −		images/pixel.pdf
+ −		images/pixel.png
+ −		images/stripped.pdf
+ −		images/stripped.png
+92 −0		microbulk.rml