Merge branch 'USRYIELD'

Author: kbat

bin/usysuw2root

@@ -0,0 +1 @@
+../mctools/fluka/usysuw2root.py

mctools/fluka/fluka2root.py

@@ -59,6 +59,7 @@ def __init__(self, args):
                            Estimator("USRCOLL",  "ustsuw"),
                            Estimator("USRTRACK", "ustsuw"),
                            Estimator("DETECT",   "detsuw"),
+                           Estimator("USRYIELD", "usysuw"),
                            Estimator("RESNUCLE", "usrsuw")]
         self.opened = {}         # dict of opened units (if any)
 
@@ -356,7 +357,7 @@ def main():
     c = Converter(args)
     c.Merge()
     val = c.Convert()
-    print(c.root)
+#    print(c.root)
 
 #    title = c.getRunTitle()
 

mctools/fluka/ustsuw2root.py

@@ -67,7 +67,7 @@ def readHeader(self, filename):
         """ Reads the file header info
             Based on Data.Usrbdx
         """
-        f = Data.Usrxxx.readHeader(self, filename)
+        f = super().readHeader(self, filename)
 #        self.sayHeader()
 
         while True:
@@ -112,7 +112,7 @@ def readHeader(self, filename):
                 print(f"{det.name}: Low energy neutrons scored with {det.ngroup} groups")
             else:
                 det.ngroup = 0
-                det.egroup = []
+                det.egroup = ()
 
             size  = (det.ngroup+det.ne) * 4
             if size != fortran.skip(f):
@@ -209,8 +209,8 @@ def main():
                 h.SetBinContent(i+1, val[i])
                 h.SetBinError(i+1,   err[n-i-1]*val[i])
 
-                h.SetEntries(b.weight)
-                h.Write()
+            h.SetEntries(b.weight)
+            h.Write()
 
 # not implemented - bugs with theINFN FLUKA, but it seems works with the CERN FLUKA
         if det.lowneu: