From a8d36a196a64e532b9e301b7d030c474d0562b67 Mon Sep 17 00:00:00 2001
From: Nicolas de Sereville <deserevi@ipno.in2p3.fr>
Date: Wed, 4 Dec 2013 18:46:27 +0100
Subject: [PATCH] + Add e628.detector file
+ Small bug in histogram size for TTiaraHyballSpectra
---
Inputs/DetectorConfiguration/e628.detector | 73 ++++++++++++++++++++++
NPLib/Tiara/TTiaraHyballSpectra.cxx | 4 +-
2 files changed, 75 insertions(+), 2 deletions(-)
create mode 100644 Inputs/DetectorConfiguration/e628.detector
diff --git a/Inputs/DetectorConfiguration/e628.detector b/Inputs/DetectorConfiguration/e628.detector
new file mode 100644
index 000000000..c7e491981
--- /dev/null
+++ b/Inputs/DetectorConfiguration/e628.detector
@@ -0,0 +1,73 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+MUST2Array
+%%%%%%% Telescope 1 %%%%%%%
+M2Telescope
+X1_Y1= 10.85 105.03 146.16
+X1_Y128= 22.8 9.84 175.95
+X128_Y1= 104.09 105.03 108.76
+X128_Y128= 116.04 9.84 138.55
+SI= 1
+SILI= 1
+CSI= 1
+VIS= all
+
+%%%%%%% Telescope 2 %%%%%%%
+M2Telescope
+X1_Y1= -116.04 9.84 138.55
+X1_Y128= -22.8 9.84 175.95
+X128_Y1= -104.09 105.03 108.76
+X128_Y128= -10.85 105.03 146.16
+SI= 1
+SILI= 1
+CSI= 1
+VIS= all
+
+%%%%%%% Telescope 3 %%%%%%%
+M2Telescope
+X1_Y1= -10.85 -105.03 146.16
+X1_Y128= -22.8 -9.84 175.95
+X128_Y1= -104.09 -105.03 108.76
+X128_Y128= -116.04 -9.84 138.55
+SI= 1
+SILI= 1
+CSI= 1
+VIS= all
+
+%%%%%%% Telescope 4 %%%%%%%
+M2Telescope
+X1_Y1= 116.04 -9.84 138.55
+X1_Y128= 22.8 -9.84 175.95
+X128_Y1= 104.09 -105.03 108.76
+X128_Y128= 10.85 -105.03 146.16
+SI= 1
+SILI= 1
+CSI= 1
+VIS= all
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+TiaraHyball
+TiaraHyballWedge
+ Z= -147
+ R= 0
+ PHI= 0
+TiaraHyballWedge
+ Z= -147
+ R= 0
+ PHI= 60
+TiaraHyballWedge
+ Z= -147
+ R= 0
+ PHI= 120
+TiaraHyballWedge
+ Z= -147
+ R= 0
+ PHI= 180
+TiaraHyballWedge
+ Z= -147
+ R= 0
+ PHI= 240
+TiaraHyballWedge
+ Z= -147
+ R= 0
+ PHI= 300
diff --git a/NPLib/Tiara/TTiaraHyballSpectra.cxx b/NPLib/Tiara/TTiaraHyballSpectra.cxx
index e4edbf7fa..8150b36e4 100644
--- a/NPLib/Tiara/TTiaraHyballSpectra.cxx
+++ b/NPLib/Tiara/TTiaraHyballSpectra.cxx
@@ -75,7 +75,7 @@ void TTiaraHyballSpectra::InitRawSpectra()
// HIT_SECTOR_RAW
name = "HYB_HIT_SECT_RAW";
- AddHisto1D(name, name, fWedgesNumber*fRingsNumber, 0, fWedgesNumber*fRingsNumber, "TIARA/HYBALL/RAW/HIT");
+ AddHisto1D(name, name, fWedgesNumber*fRingsNumber, 0, fWedgesNumber*fSectorsNumber, "TIARA/HYBALL/RAW/HIT");
// RING_E_RAW
name = "HYB_RING_E_RAW";
@@ -110,7 +110,7 @@ void TTiaraHyballSpectra::InitPreTreatedSpectra()
// HIT_SECTOR_CAL
name = "HYB_HIT_SECT_CAL";
- AddHisto1D(name, name, fWedgesNumber*fRingsNumber, 0, fWedgesNumber*fRingsNumber, "TIARA/HYBALL/CAL/HIT");
+ AddHisto1D(name, name, fWedgesNumber*fRingsNumber, 0, fWedgesNumber*fSectorsNumber, "TIARA/HYBALL/CAL/HIT");
// RING_E_CAL
name = "HYB_RING_E_CAL";
--
GitLab