One more fix to ScifiCTR method for non-standard Nmats per plane

Add new testbeam Scifi time alignment.
SND-LHC · Mar 11, 2024 · 6133ec7 · 6133ec7
1 parent 0c14e95
commit 6133ec7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/geometry/sndLHC_HXgeom_config.py b/geometry/sndLHC_HXgeom_config.py
@@ -2,9 +2,9 @@
 import shipunit as u
 from ShipGeoConfig import AttrDict, ConfigRegistry
 
-tb_2023_mc = False
 if "tb_2023_mc" in globals():
     tb_2023_mc = True
+else: tb_2023_mc = False
 
 with ConfigRegistry.register_config("basic") as c:
 # cave parameters
@@ -388,7 +388,7 @@
              c.Scifi.RotPhiS40,c.Scifi.RotPsiS40,c.Scifi.RotThetaS40 =     0.00*u.mrad,    0.15*u.mrad,    0.00*u.mrad
              c.Scifi.RotPhiS41,c.Scifi.RotPsiS41,c.Scifi.RotThetaS41 =     0.00*u.mrad,    3.13*u.mrad,    0.00*u.mrad
 # Time alignment Scifi, T0 = station 0,  mat 0 
-             c.Scifi.station1t,c.Scifi.station1H0t,c.Scifi.station1V0t  =  0.000*u.ns,  0.000*u.ns,  0.000*u.ns
-             c.Scifi.station2t,c.Scifi.station2H0t,c.Scifi.station2V0t  =  0.338*u.ns,  0.000*u.ns,  0.000*u.ns
-             c.Scifi.station3t,c.Scifi.station3H0t,c.Scifi.station3V0t  =  2.015*u.ns,  0.000*u.ns,  0.000*u.ns
-             c.Scifi.station4t,c.Scifi.station4H0t,c.Scifi.station4V0t  =  0.908*u.ns,  0.000*u.ns,  0.000*u.ns
+             c.Scifi.station1t,c.Scifi.station1H0t,c.Scifi.station1V0t =  0.000*u.ns,  0.000*u.ns,  1.535*u.ns
+             c.Scifi.station2t,c.Scifi.station2H0t,c.Scifi.station2V0t =  1.246*u.ns,  0.000*u.ns,  -0.281*u.ns
+             c.Scifi.station3t,c.Scifi.station3H0t,c.Scifi.station3V0t =  3.240*u.ns,  0.000*u.ns,  -0.913*u.ns
+             c.Scifi.station4t,c.Scifi.station4H0t,c.Scifi.station4V0t =  1.750*u.ns,  0.000*u.ns,  -0.145*u.ns
diff --git a/shipLHC/scripts/ScifiCTR.py b/shipLHC/scripts/ScifiCTR.py
@@ -23,7 +23,7 @@ def FCN(npar, gin, f, par, iflag):
        for matH in range(nMats):
             for matV in range(nMats):
                tdiff = X.GetBinContent(matH*10+matV)
-               d = tdiff - (par[matH] - par[matV+3])
+               d = tdiff - (par[matH] - par[matV+nMats])
                chisq += d**2
        f.value = chisq
        return
@@ -265,7 +265,7 @@ def minimize(self,b=""):
                key = 100*s+10*matH+matV
                dt = self.meanAndSigma[b][key][0]
                h['commonBlock'].SetBinContent(matH*10+matV,dt)
-         npar = 2*3
+         npar = 2*nMats
          ierflg    = ctypes.c_int(0)
          vstart  = array('d',[0]*npar)
          gMinuit = ROOT.TMinuit(npar)