Merge pull request #4 from LSexton2396/cobraa2

Cobraa2

Author: ekneale

.gitignore

@@ -1,4 +1,4 @@
-env_wm.*
+env_cobraa.*
 *.txt
 *.pyc
 *.root
@@ -9,3 +9,4 @@ fred_root_files*
 log_*
 *.C
 *.png
+testjob.mac

cobraa.py

@@ -11,7 +11,11 @@
 
 if __name__ == '__main__':
 
-    print(docstring)
+    #fix path for directory generation
+    path=os.environ['COBRAAENV']
+    os.chdir(path)
+
+    #print(docstring)
     if arguments['-v']:
     	print(arguments)
 #     print defaultValues
@@ -38,16 +42,21 @@
     if arguments['--backgrounds']:
         backgrounds()
 
-    print('''All done.
+    if arguments['--reset']:
+        reset()
+
+    print("\n All done")
+
+    #print('''All done.
 
-You can submit multiple jobs with a single command line 'for i in `ls job/job*.sh`; do bsub $i; done')
+#You can submit multiple jobs with a single command line 'for i in `ls job/job*.sh`; do bsub $i; done')
 
-You can use the stand-along version of bonsai (bonsai2) by copying a like.bin to the base folder and doing the following steps:
->bsub
->source /p/gpfs1/adg/wmutils/env.sh
->for i in `ls root_files_*/*/*`; do bonsai2 $i bonsai_$i 3000 800 -500 1000 1;done
->Ctrl-D
-which will work on lassen. (Option should be 'do bonsai2 $i bonsai_$i 3000 800 -500 1000 0' for wbls.)
-''')
+#You can use the stand-along version of bonsai (bonsai2) by copying a like.bin to the base folder and doing the following steps:
+#>bsub
+#>source /p/gpfs1/adg/wmutils/env.sh
+#>for i in `ls root_files_*/*/*`; do bonsai2 $i bonsai_$i 3000 800 -500 1000 1;done
+#>Ctrl-D
+#which will work on lassen. (Option should be 'do bonsai2 $i bonsai_$i 3000 800 -500 1000 0' for wbls.)
+#''')
 
 ######################## End of main function  ###########################

cobraa/globals.py

@@ -29,6 +29,11 @@ def drange(start, stop, step):
 nruns = int(arguments['-N'])
 nsetSingles = 200
 detectorStr = f"{arguments['--geofile']}"
+experimentStr = f"{arguments['--expname']}"
+if (arguments['--bonsai']):
+    filetype="reconstructed"
+else:
+    filetype="raw"
 
 # Reactor on/off ratio based on typical AGR-1 schedule
 RonOff = (4*2)/52.
@@ -81,20 +86,24 @@ def testEnabledCondition(arguments):
     additionalMacOpt      = ""
 
     # file naming
-    additionalString += "_%s"%(arguments['--geofile'])
+    additionalString += "_%s"%(arguments['--expname'])
 
     if (arguments['--lightSimWater']):
         additionalString += "_lightSimWater"
 
     if (arguments['--lightSimWbLS']):
         additionalString += "_lightSimWbLS"
+        arguments['--detectMedia']="WBLS"
+
+    if arguments['--singles']:
+        additionalString += "_singles"
 
     # additional macro commands
-    if (arguments['--detectMedia']):
+    if (arguments['--detectMedia']): #This does not work for lightSimWbLS unless detectMedia is changed
         additionalMacOpt +="/rat/db/set GEO[detector_veto1] material \"%s\"\n"%(arguments['--detectMedia'])
         additionalMacOpt += "/rat/db/set GEO[detector_target_gb] material \"%s\"\n"%(arguments['--detectMedia'])
         additionalMacOpt += "/rat/db/set GEO[detector_target_fv] material \"%s\"\n"%(arguments['--detectMedia'])
-        additionalString += "_detectorMedia_%s" %(arguments['--detectMedia'])
+        additionalString += "_%s" %(arguments['--detectMedia'])
 
     if (arguments['--collectionEff']):
         additionalMacOpt += "/rat/db/set GEO[inner_pmts] efficiency_correction %f\n" %(float(arguments['--collectionEff']))