From 30ffd5193e0f492bc1a24ff867a4eb79d85b61fc Mon Sep 17 00:00:00 2001
From: Mark Jones <jones@jlab.org>
Date: Mon, 20 Aug 2018 21:29:12 -0400
Subject: [PATCH] Modified CALIBRATION/bpm_calib
1) Modified the BPM z positions in
bpm_calibration.C to match the Fall 2018 survey
2) Moved the documentation to Documnetation subdirectory
3) Moved harp input files to Harp_files subdirectory
---
.../BPM Calibration Update August 2018.pdf | Bin
.../BPM Calibration Update August 2018.pptx | Bin
.../BPM Calibration Update July 2018.pdf | Bin
.../BPM Calibration Update July 2018.pptx | Bin
.../{ => Documentation}/Hall_C_Raster_Algorithm.jpg | Bin
.../bpm_calib/{ => Harp_files}/harp_info.txt | 0
.../bpm_calib/{ => Harp_files}/harp_info.txt.extra | 0
.../{ => Harp_files}/harp_info.txt.extra.no1766 | 0
.../harp_info.txt.extra.no1766.small | 0
.../harp_info.txt.extra.no1766.with3129 | 0
.../harp_info.txt.extra.no1766.with3129.short | 0
.../{ => Harp_files}/harp_info.txt.just1765and1766 | 0
.../bpm_calib/{ => Harp_files}/harp_info.txt.no1765 | 0
.../{ => Harp_files}/harp_info.txt.no1765or1766 | 0
.../bpm_calib/{ => Harp_files}/harp_info.txt.no1766 | 0
.../bpm_calib/{ => Harp_files}/harp_info.txt.orig | 0
CALIBRATION/bpm_calib/bpm_calibration.C | 6 +++---
17 files changed, 3 insertions(+), 3 deletions(-)
rename CALIBRATION/bpm_calib/{ => Documentation}/BPM Calibration Update August 2018.pdf (100%)
rename CALIBRATION/bpm_calib/{ => Documentation}/BPM Calibration Update August 2018.pptx (100%)
rename CALIBRATION/bpm_calib/{ => Documentation}/BPM Calibration Update July 2018.pdf (100%)
rename CALIBRATION/bpm_calib/{ => Documentation}/BPM Calibration Update July 2018.pptx (100%)
rename CALIBRATION/bpm_calib/{ => Documentation}/Hall_C_Raster_Algorithm.jpg (100%)
rename CALIBRATION/bpm_calib/{ => Harp_files}/harp_info.txt (100%)
rename CALIBRATION/bpm_calib/{ => Harp_files}/harp_info.txt.extra (100%)
rename CALIBRATION/bpm_calib/{ => Harp_files}/harp_info.txt.extra.no1766 (100%)
rename CALIBRATION/bpm_calib/{ => Harp_files}/harp_info.txt.extra.no1766.small (100%)
rename CALIBRATION/bpm_calib/{ => Harp_files}/harp_info.txt.extra.no1766.with3129 (100%)
rename CALIBRATION/bpm_calib/{ => Harp_files}/harp_info.txt.extra.no1766.with3129.short (100%)
rename CALIBRATION/bpm_calib/{ => Harp_files}/harp_info.txt.just1765and1766 (100%)
rename CALIBRATION/bpm_calib/{ => Harp_files}/harp_info.txt.no1765 (100%)
rename CALIBRATION/bpm_calib/{ => Harp_files}/harp_info.txt.no1765or1766 (100%)
rename CALIBRATION/bpm_calib/{ => Harp_files}/harp_info.txt.no1766 (100%)
rename CALIBRATION/bpm_calib/{ => Harp_files}/harp_info.txt.orig (100%)
diff --git a/CALIBRATION/bpm_calib/BPM Calibration Update August 2018.pdf b/CALIBRATION/bpm_calib/Documentation/BPM Calibration Update August 2018.pdf
similarity index 100%
rename from CALIBRATION/bpm_calib/BPM Calibration Update August 2018.pdf
rename to CALIBRATION/bpm_calib/Documentation/BPM Calibration Update August 2018.pdf
diff --git a/CALIBRATION/bpm_calib/BPM Calibration Update August 2018.pptx b/CALIBRATION/bpm_calib/Documentation/BPM Calibration Update August 2018.pptx
similarity index 100%
rename from CALIBRATION/bpm_calib/BPM Calibration Update August 2018.pptx
rename to CALIBRATION/bpm_calib/Documentation/BPM Calibration Update August 2018.pptx
diff --git a/CALIBRATION/bpm_calib/BPM Calibration Update July 2018.pdf b/CALIBRATION/bpm_calib/Documentation/BPM Calibration Update July 2018.pdf
similarity index 100%
rename from CALIBRATION/bpm_calib/BPM Calibration Update July 2018.pdf
rename to CALIBRATION/bpm_calib/Documentation/BPM Calibration Update July 2018.pdf
diff --git a/CALIBRATION/bpm_calib/BPM Calibration Update July 2018.pptx b/CALIBRATION/bpm_calib/Documentation/BPM Calibration Update July 2018.pptx
similarity index 100%
rename from CALIBRATION/bpm_calib/BPM Calibration Update July 2018.pptx
rename to CALIBRATION/bpm_calib/Documentation/BPM Calibration Update July 2018.pptx
diff --git a/CALIBRATION/bpm_calib/Hall_C_Raster_Algorithm.jpg b/CALIBRATION/bpm_calib/Documentation/Hall_C_Raster_Algorithm.jpg
similarity index 100%
rename from CALIBRATION/bpm_calib/Hall_C_Raster_Algorithm.jpg
rename to CALIBRATION/bpm_calib/Documentation/Hall_C_Raster_Algorithm.jpg
diff --git a/CALIBRATION/bpm_calib/harp_info.txt b/CALIBRATION/bpm_calib/Harp_files/harp_info.txt
similarity index 100%
rename from CALIBRATION/bpm_calib/harp_info.txt
rename to CALIBRATION/bpm_calib/Harp_files/harp_info.txt
diff --git a/CALIBRATION/bpm_calib/harp_info.txt.extra b/CALIBRATION/bpm_calib/Harp_files/harp_info.txt.extra
similarity index 100%
rename from CALIBRATION/bpm_calib/harp_info.txt.extra
rename to CALIBRATION/bpm_calib/Harp_files/harp_info.txt.extra
diff --git a/CALIBRATION/bpm_calib/harp_info.txt.extra.no1766 b/CALIBRATION/bpm_calib/Harp_files/harp_info.txt.extra.no1766
similarity index 100%
rename from CALIBRATION/bpm_calib/harp_info.txt.extra.no1766
rename to CALIBRATION/bpm_calib/Harp_files/harp_info.txt.extra.no1766
diff --git a/CALIBRATION/bpm_calib/harp_info.txt.extra.no1766.small b/CALIBRATION/bpm_calib/Harp_files/harp_info.txt.extra.no1766.small
similarity index 100%
rename from CALIBRATION/bpm_calib/harp_info.txt.extra.no1766.small
rename to CALIBRATION/bpm_calib/Harp_files/harp_info.txt.extra.no1766.small
diff --git a/CALIBRATION/bpm_calib/harp_info.txt.extra.no1766.with3129 b/CALIBRATION/bpm_calib/Harp_files/harp_info.txt.extra.no1766.with3129
similarity index 100%
rename from CALIBRATION/bpm_calib/harp_info.txt.extra.no1766.with3129
rename to CALIBRATION/bpm_calib/Harp_files/harp_info.txt.extra.no1766.with3129
diff --git a/CALIBRATION/bpm_calib/harp_info.txt.extra.no1766.with3129.short b/CALIBRATION/bpm_calib/Harp_files/harp_info.txt.extra.no1766.with3129.short
similarity index 100%
rename from CALIBRATION/bpm_calib/harp_info.txt.extra.no1766.with3129.short
rename to CALIBRATION/bpm_calib/Harp_files/harp_info.txt.extra.no1766.with3129.short
diff --git a/CALIBRATION/bpm_calib/harp_info.txt.just1765and1766 b/CALIBRATION/bpm_calib/Harp_files/harp_info.txt.just1765and1766
similarity index 100%
rename from CALIBRATION/bpm_calib/harp_info.txt.just1765and1766
rename to CALIBRATION/bpm_calib/Harp_files/harp_info.txt.just1765and1766
diff --git a/CALIBRATION/bpm_calib/harp_info.txt.no1765 b/CALIBRATION/bpm_calib/Harp_files/harp_info.txt.no1765
similarity index 100%
rename from CALIBRATION/bpm_calib/harp_info.txt.no1765
rename to CALIBRATION/bpm_calib/Harp_files/harp_info.txt.no1765
diff --git a/CALIBRATION/bpm_calib/harp_info.txt.no1765or1766 b/CALIBRATION/bpm_calib/Harp_files/harp_info.txt.no1765or1766
similarity index 100%
rename from CALIBRATION/bpm_calib/harp_info.txt.no1765or1766
rename to CALIBRATION/bpm_calib/Harp_files/harp_info.txt.no1765or1766
diff --git a/CALIBRATION/bpm_calib/harp_info.txt.no1766 b/CALIBRATION/bpm_calib/Harp_files/harp_info.txt.no1766
similarity index 100%
rename from CALIBRATION/bpm_calib/harp_info.txt.no1766
rename to CALIBRATION/bpm_calib/Harp_files/harp_info.txt.no1766
diff --git a/CALIBRATION/bpm_calib/harp_info.txt.orig b/CALIBRATION/bpm_calib/Harp_files/harp_info.txt.orig
similarity index 100%
rename from CALIBRATION/bpm_calib/harp_info.txt.orig
rename to CALIBRATION/bpm_calib/Harp_files/harp_info.txt.orig
diff --git a/CALIBRATION/bpm_calib/bpm_calibration.C b/CALIBRATION/bpm_calib/bpm_calibration.C
index edf795f3..fa86fe58 100644
--- a/CALIBRATION/bpm_calib/bpm_calibration.C
+++ b/CALIBRATION/bpm_calib/bpm_calibration.C
@@ -38,9 +38,9 @@ bpm_calibration(const char* finname = "harp_info.txt"){
- Double_t bpmAz = 370.826; // unit cm , from survey
- Double_t bpmBz = 224.968; // unit cm , from survey
- Double_t bpmCz = 129.314; // unit cm , from survey
+ Double_t bpmAz = 320.17; // unit cm , from survey Fall 2018
+ Double_t bpmBz = 224.81; // unit cm , from survey
+ Double_t bpmCz = 129.38; // unit cm , from survey
Double_t ibcm1;
Double_t bpmAxpos,bpmAypos,bpmBxpos,bpmBypos,bpmCxpos,bpmCypos;
--
GitLab