Merge branch 'NPTool.dev.prerelease' of https://github.com/adrien-matta/nptool...

Merge branch 'NPTool.dev.prerelease' of https://github.com/adrien-matta/nptool into NPTool.dev.prerelease

Inputs/DetectorConfiguration/e628.detector

+%%%%%%%%%%%%%%%%%%%%%%%%%%%         
+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

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";