Fix some errors after update in trg

belle2 · Jul 5, 2021 · 5443500 · 5443500
1 parent 935e2b6
commit 5443500
Show file tree

Hide file tree

Showing 285 changed files with 1,999 additions and 2,793 deletions.
diff --git a/trg/cdc/examples/ELoss.patch b/trg/cdc/examples/ELoss.patch
@@ -1,10 +1,3 @@
-/**************************************************************************
- * basf2 (Belle II Analysis Software Framework)                           *
- * Author: The Belle II Collaboration                                     *
- *                                                                        *
- * See git log for contributors and copyright holders.                    *
- * This file is licensed under LGPL-3.0, see LICENSE.md.                  *
- **************************************************************************/
 --- ../../cdc/simulation/src/SensitiveDetector.cc	2012-02-10 11:46:08.000000000 +0900
 +++ ../../cdc/simulation/src/SensitiveDetector.cc.new	2012-02-10 11:46:03.000000000 +0900
 @@ -104,7 +104,9 @@

diff --git a/trg/cdc/examples/ELoss.py b/trg/cdc/examples/ELoss.py
@@ -9,10 +9,6 @@
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
 
-# --------------------------------------------------------------
-# Filename : ELoss.py
-# Owner    : KyungTae Kim (K.U.)
-# Email    : ktkim@hep.korea.ac.kr
 # --------------------------------------------------------------
 # Description : Patch to turn off the physics process in Geant4
 #               assuming cdc package is added in local

diff --git a/trg/cdc/examples/HoughETF.py b/trg/cdc/examples/HoughETF.py
@@ -1,12 +1,4 @@
 #!/usr/bin/env python
-#
-# -----------------------------------------------------------------------------------
-#
-#                        CDCTrg Hough ETF  module
-#
-#    usage : %> basf2 HoughETF.py -i [input root file name]
-#
-# -----------------------------------------------------------------------------------
 
 ##########################################################################
 # basf2 (Belle II Analysis Software Framework)                           #
@@ -15,6 +7,15 @@
 # See git log for contributors and copyright holders.                    #
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
+
+# -----------------------------------------------------------------------------------
+#
+#                        CDCTrg Hough ETF  module
+#
+#    usage : %> basf2 HoughETF.py -i [input root file name]
+#
+# -----------------------------------------------------------------------------------
+
 import basf2 as b2
 from ROOT import Belle2
 

diff --git a/trg/cdc/examples/TrgCdcUnpacker.py b/trg/cdc/examples/TrgCdcUnpacker.py
@@ -1,12 +1,4 @@
 #!/usr/bin/env python
-#
-# -----------------------------------------------------------------------------------
-#
-#                        CDCTSF trigger Unpacker module
-#
-#    usage : %> basf2 TrgCdcTsfUnpacker.py [input sroot file name]
-#
-# -----------------------------------------------------------------------------------
 
 ##########################################################################
 # basf2 (Belle II Analysis Software Framework)                           #
@@ -15,6 +7,15 @@
 # See git log for contributors and copyright holders.                    #
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
+
+# -----------------------------------------------------------------------------------
+#
+#                        CDCTSF trigger Unpacker module
+#
+#    usage : %> basf2 TrgCdcTsfUnpacker.py [input sroot file name]
+#
+# -----------------------------------------------------------------------------------
+
 import basf2 as b2
 
 import sys

diff --git a/trg/cdc/examples/dqmNeuro.py b/trg/cdc/examples/dqmNeuro.py
@@ -5,6 +5,7 @@
 # See git log for contributors and copyright holders.                    #
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
+
 import basf2
 import neurotrigger
 import reconstruction

diff --git a/trg/cdc/examples/dqmNeuro_SW.py b/trg/cdc/examples/dqmNeuro_SW.py
@@ -5,6 +5,7 @@
 # See git log for contributors and copyright holders.                    #
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
+
 import basf2
 import neurotrigger
 import sys

diff --git a/trg/cdc/examples/dqmNeuro_generateSWinput.py b/trg/cdc/examples/dqmNeuro_generateSWinput.py
@@ -5,6 +5,7 @@
 # See git log for contributors and copyright holders.                    #
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
+
 import basf2 as b2
 from ROOT import Belle2
 import glob

diff --git a/trg/cdc/examples/dqmTest.py b/trg/cdc/examples/dqmTest.py
@@ -5,6 +5,7 @@
 # See git log for contributors and copyright holders.                    #
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
+
 import basf2 as b2
 
 

diff --git a/trg/cdc/examples/trgcdct3dDQM.py b/trg/cdc/examples/trgcdct3dDQM.py
@@ -1,13 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#
-# -----------------------------------------------------------------------------------
-#
-#                        CDCTRGT3D Unpacker and Converter
-#
-#    usage : %> basf2 trgcdct3dUnpackerConverter -i [input sroot file name] -o [output root file name]
-#
-# -----------------------------------------------------------------------------------
 
 ##########################################################################
 # basf2 (Belle II Analysis Software Framework)                           #
@@ -16,6 +8,15 @@
 # See git log for contributors and copyright holders.                    #
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
+
+# -----------------------------------------------------------------------------------
+#
+#                        CDCTRGT3D Unpacker and Converter
+#
+#    usage : %> basf2 trgcdct3dUnpackerConverter -i [input sroot file name] -o [output root file name]
+#
+# -----------------------------------------------------------------------------------
+
 import basf2
 import ROOT.Belle2
 

diff --git a/trg/cdc/examples/trgcdct3dUnpackerConverter.py b/trg/cdc/examples/trgcdct3dUnpackerConverter.py
@@ -1,13 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#
-# -----------------------------------------------------------------------------------
-#
-#                        CDCTRGT3D Unpacker and Converter
-#
-#    usage : %> basf2 trgcdct3dUnpackerConverter -i [input sroot file name] -o [output root file name]
-#
-# -----------------------------------------------------------------------------------
 
 ##########################################################################
 # basf2 (Belle II Analysis Software Framework)                           #
@@ -16,6 +8,15 @@
 # See git log for contributors and copyright holders.                    #
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
+
+# -----------------------------------------------------------------------------------
+#
+#                        CDCTRGT3D Unpacker and Converter
+#
+#    usage : %> basf2 trgcdct3dUnpackerConverter -i [input sroot file name] -o [output root file name]
+#
+# -----------------------------------------------------------------------------------
+
 import basf2
 import ROOT.Belle2
 

diff --git a/trg/cdc/examples/trgcdctsf0DQM.py b/trg/cdc/examples/trgcdctsf0DQM.py
@@ -1,12 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------------
-#
-#                      Example of GDL trigger DQM Module
-#
-#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
-#
-# -----------------------------------------------------------------------------------
 
 ##########################################################################
 # basf2 (Belle II Analysis Software Framework)                           #
@@ -16,6 +9,14 @@
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
 
+# -----------------------------------------------------------------------------------
+#
+#                      Example of GDL trigger DQM Module
+#
+#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
+#
+# -----------------------------------------------------------------------------------
+
 import basf2 as b2
 ################
 import sys  # get argv

diff --git a/trg/cdc/examples/trgcdctsf1DQM.py b/trg/cdc/examples/trgcdctsf1DQM.py
@@ -1,12 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------------
-#
-#                      Example of GDL trigger DQM Module
-#
-#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
-#
-# -----------------------------------------------------------------------------------
 
 ##########################################################################
 # basf2 (Belle II Analysis Software Framework)                           #
@@ -16,6 +9,14 @@
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
 
+# -----------------------------------------------------------------------------------
+#
+#                      Example of GDL trigger DQM Module
+#
+#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
+#
+# -----------------------------------------------------------------------------------
+
 import basf2 as b2
 ################
 import sys  # get argv

diff --git a/trg/cdc/examples/trgcdctsf2DQM.py b/trg/cdc/examples/trgcdctsf2DQM.py
@@ -1,12 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------------
-#
-#                      Example of GDL trigger DQM Module
-#
-#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
-#
-# -----------------------------------------------------------------------------------
 
 ##########################################################################
 # basf2 (Belle II Analysis Software Framework)                           #
@@ -16,6 +9,14 @@
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
 
+# -----------------------------------------------------------------------------------
+#
+#                      Example of GDL trigger DQM Module
+#
+#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
+#
+# -----------------------------------------------------------------------------------
+
 import basf2 as b2
 ################
 import sys  # get argv

diff --git a/trg/cdc/examples/trgcdctsf3DQM.py b/trg/cdc/examples/trgcdctsf3DQM.py
@@ -1,12 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------------
-#
-#                      Example of GDL trigger DQM Module
-#
-#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
-#
-# -----------------------------------------------------------------------------------
 
 ##########################################################################
 # basf2 (Belle II Analysis Software Framework)                           #
@@ -16,6 +9,14 @@
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
 
+# -----------------------------------------------------------------------------------
+#
+#                      Example of GDL trigger DQM Module
+#
+#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
+#
+# -----------------------------------------------------------------------------------
+
 import basf2 as b2
 ################
 import sys  # get argv

diff --git a/trg/cdc/examples/trgcdctsf4DQM.py b/trg/cdc/examples/trgcdctsf4DQM.py
@@ -1,12 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------------
-#
-#                      Example of GDL trigger DQM Module
-#
-#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
-#
-# -----------------------------------------------------------------------------------
 
 ##########################################################################
 # basf2 (Belle II Analysis Software Framework)                           #
@@ -16,6 +9,14 @@
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
 
+# -----------------------------------------------------------------------------------
+#
+#                      Example of GDL trigger DQM Module
+#
+#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
+#
+# -----------------------------------------------------------------------------------
+
 import basf2 as b2
 ################
 import sys  # get argv

diff --git a/trg/cdc/examples/trgcdctsfDQM.py b/trg/cdc/examples/trgcdctsfDQM.py
@@ -1,12 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------------
-#
-#                      Example of GDL trigger DQM Module
-#
-#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
-#
-# -----------------------------------------------------------------------------------
 
 ##########################################################################
 # basf2 (Belle II Analysis Software Framework)                           #
@@ -16,6 +9,14 @@
 # This file is licensed under LGPL-3.0, see LICENSE.md.                  #
 ##########################################################################
 
+# -----------------------------------------------------------------------------------
+#
+#                      Example of GDL trigger DQM Module
+#
+#    usage : %> basf2 trgcdctsfDQM.py [input sroot file name]
+#
+# -----------------------------------------------------------------------------------
+
 import basf2 as b2
 ################
 import sys  # get argv

diff --git a/trg/cdc/include/Cell.h b/trg/cdc/include/Cell.h
@@ -5,18 +5,10 @@
  * See git log for contributors and copyright holders.                    *
  * This file is licensed under LGPL-3.0, see LICENSE.md.                  *
  **************************************************************************/
-//-----------------------------------------------------------------------------
-// $Id$
-//-----------------------------------------------------------------------------
-// Filename : Cell.h
-// Section  : TRG CDC
-// Owner    : Yoshihito Iwasaki
-// Email    : yoshihito.iwasaki@kek.jp
+
 //-----------------------------------------------------------------------------
 // Description : A class to represent a cell (a wire or a track segment) in CDC.
 //-----------------------------------------------------------------------------
-// $Log$
-//-----------------------------------------------------------------------------
 
 #ifndef TRGCDCCell_FLAG_
 #define TRGCDCCell_FLAG_

diff --git a/trg/cdc/include/CellHit.h b/trg/cdc/include/CellHit.h
@@ -5,18 +5,10 @@
  * See git log for contributors and copyright holders.                    *
  * This file is licensed under LGPL-3.0, see LICENSE.md.                  *
  **************************************************************************/
-//-----------------------------------------------------------------------------
-// $Id$
-//-----------------------------------------------------------------------------
-// Filename : CellHit.h
-// Section  : TRG CDC
-// Owner    : Yoshihito Iwasaki
-// Email    : yoshihito.iwasaki@kek.jp
+
 //-----------------------------------------------------------------------------
 // Description : A class to represent a cell hit in CDC.
 //-----------------------------------------------------------------------------
-// $Log$
-//-----------------------------------------------------------------------------
 
 #ifndef TRGCDCCellHit_FLAG_
 #define TRGCDCCellHit_FLAG_

diff --git a/trg/cdc/include/Circle.h b/trg/cdc/include/Circle.h
@@ -5,18 +5,10 @@
  * See git log for contributors and copyright holders.                    *
  * This file is licensed under LGPL-3.0, see LICENSE.md.                  *
  **************************************************************************/
-//-----------------------------------------------------------------------------
-// $Id$
-//-----------------------------------------------------------------------------
-// Filename : Circle.h
-// Section  : TRG CDC
-// Owner    : Yoshihito Iwasaki
-// Email    : yoshihito.iwasaki@kek.jp
+
 //-----------------------------------------------------------------------------
 // Description : A class to represent a circle
 //-----------------------------------------------------------------------------
-// $Log$
-//-----------------------------------------------------------------------------
 
 #ifndef TRGCDCCircle_FLAG_
 #define TRGCDCCircle_FLAG_