Merge branch '21.6-superchic-jo' into '21.6'

Superchic example job option fix

See merge request !46574

Generators/Superchic_i/share/jobOptions.SuperChic_ALP2.py

@@ -32,7 +32,7 @@ scConfig.etabmax   = 2.4           # Maximum eta of outgoing object b
 scConfig.acoabmax  = 100
 
 
-#SuperChicRun(scConfig, genSeq)
+SuperChicRun(scConfig, genSeq)
 
 import Superchic_i.EventFiller as EF
 ef = EF.LheEVNTFiller()

Generators/Superchic_i/share/jobOptions.Superchic.py

-evgenConfig.description = "Superchic gamma + gamma UPC collisions at 5020 GeV"
-evgenConfig.keywords = ["2photon","2lepton"]
-#evgenConfig.weighting = 0
-evgenConfig.contact = ["prabhakar.palni@cern.ch"]
-
-if not os.path.exists('inputs'):
-    os.makedirs('inputs')
-if not os.path.exists('evrecs'):
-    os.makedirs('evrecs')
-
-from Superchic_i.Superchic_iConf import Superchic_i
-genSeq += Superchic_i("Superchic")
-genSeq.Superchic.McEventKey = "GEN_EVENT"
-evgenConfig.generators += ["Superchic"]
-
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-_evgenstream = AthenaPoolOutputStream("StreamEVGEN")
-_evgenstream.ItemList = ["2101#*","133273#GEN_EVENT"]
-
-del _evgenstream
-
-
-# TODO: Sort out proper param setting based on runArgs.ecmEnergy
-if int(runArgs.ecmEnergy) != 5020:
-    evgenLog.error(" Set beam energy in JO initialization with parameter rts ")
-    sys.exit(1)
-
-    
-genSeq.Superchic.Initialize = \
-    ["rts 5.02d3",                     # set the COM collision energy (in fortran syntax)
-    "isurv 4",                        # Model of soft survival
-    "intag 'in5'",                    # for input files
-    "PDFname 'MMHT2014lo68cl'",       # PDF set name
-    "PDFmember 0",                    # PDF member
-    "proc 59",                        # Process number (59 = gg->gg, 56 =gg->ee )
-    "beam 'ion'",                     # Beam type ('prot', 'ion')
-    "outtg 'out'",                    # for output file name
-    "sfaci .false.",                  # Include soft survival effects
-    "ncall 100000",                   # Number of calls for preconditioning
-    "itmx 1",                        # Number of iterations for preconditioning
-    "prec 1.0d0"                    # precision
-    ]

Generators/Superchic_i/share/jobOptions.Superchic_UPC_yyMuMu.py

+evgenConfig.description = "Superchic gamma + gamma UPC collisions at 5020 GeV"
+evgenConfig.keywords = ["2photon","2lepton"]
+#evgenConfig.weighting = 0
+evgenConfig.contact = ["prabhakar.palni@cern.ch"]
+evgenConfig.generators += ["Superchic"]
+
+from Superchic_i.SuperChicUtils import SuperChicConfig, SuperChicRun
+
+#class with the superchic initialization parameters.  Please see SuperChicUtils for a complete list of tunable parameters.
+scConfig = SuperChicConfig(runArgs)
+
+scConfig.isurv = 4                  # Model of soft survival (from 1 -> 4, corresponding to arXiv:1306.2149)
+scConfig.PDFname = 'MMHT2014lo68cl' # PDF set name
+scConfig.PDFmember = 0              # PDF member
+scConfig.proc = 59                  # Process number (59 = gg->gg, 56 = gg->ee, 68 = gg->a->gg ); Please consult Superchic Manual https://superchic.hepforge.org/
+scConfig.beam = 'ion'              # Beam type ('prot', 'ion')
+scConfig.sfaci = False             # Include soft survival effects
+scConfig.ncall = 100000            # Number of calls for preconditioning
+scConfig.itmx = 1                 # Number of iterations for preconditioning
+scConfig.prec = 1.0                # precision
+
+SuperChicRun(scConfig, genSeq)
+
+import Superchic_i.EventFiller as EF
+ef = EF.LheEVNTFiller()
+ef.fileName = scConfig.outputLHEFile()
+outputFileName = "outputs/output"+scConfig.outtg+".dat"
+ef.outputFileName = outputFileName
+genSeq += ef