Updating repo for software review.

README

+dibaslibs is symlink to /home/dibas/dibaslibs
+etc dir is copied from /home/dibas
+dibas.bash also copied from /home/dibas

apps

+/home/groups/flag/dibas/versions/instances4/apps
\ No newline at end of file

bin

+/home/groups/flag/dibas/versions/instances4/bin
\ No newline at end of file

dibaslibs

+/home/dibas/dibaslibs
\ No newline at end of file

etc/config/dibas.conf

@@ -78,8 +78,8 @@ flag5 = 10.17.16.216 10.17.16.217 10.17.16.218 10.17.16.219
 # srbs-hpc1-10 = 0x0002C9F558D1
 
 [DEALER]
-players = BANKA BANKB BANKC BANKD BANKE BANKF BANKG BANKH BANKI BANKJ BANKK BANKL BANKM BANKN BANKO BANKP
-#players = BANKA BANKB BANKC BANKD BANKE BANKF BANKG BANKH BANKI BANKJ BANKK BANKL BANKM BANKN BANKO BANKP BANKQ BANKR BANKS BANKT
+#players = BANKA BANKB BANKC BANKD BANKE BANKF BANKG BANKH BANKI BANKJ BANKK BANKL BANKM BANKN BANKO BANKP
+players = BANKA BANKB BANKC BANKD BANKE BANKF BANKG BANKH BANKI BANKJ BANKK BANKL BANKM BANKN BANKO BANKP BANKQ BANKR BANKS BANKT
 #players = BANKA BANKB BANKC BANKD BANKE BANKF BANKG BANKH BANKI BANKJ BANKK BANKL BANKQ BANKR BANKS BANKT
 
 # Bank configurations.

etc/config/dibas.conf.main

@@ -78,8 +78,8 @@ flag5 = 10.17.16.216 10.17.16.217 10.17.16.218 10.17.16.219
 # srbs-hpc1-10 = 0x0002C9F558D1
 
 [DEALER]
-players = BANKA BANKB BANKC BANKD BANKE BANKF BANKG BANKH BANKI BANKJ BANKK BANKL BANKM BANKN BANKO BANKP
-#players = BANKA BANKB BANKC BANKD BANKE BANKF BANKG BANKH BANKI BANKJ BANKK BANKL BANKM BANKN BANKO BANKP BANKQ BANKR BANKS BANKT
+#players = BANKA BANKB BANKC BANKD BANKE BANKF BANKG BANKH BANKI BANKJ BANKK BANKL BANKM BANKN BANKO BANKP
+players = BANKA BANKB BANKC BANKD BANKE BANKF BANKG BANKH BANKI BANKJ BANKK BANKL BANKM BANKN BANKO BANKP BANKQ BANKR BANKS BANKT
 #players = BANKA BANKB BANKC BANKD BANKE BANKF BANKG BANKH BANKI BANKJ BANKK BANKL BANKQ BANKR BANKS BANKT
 
 # Bank configurations.

exec

+/home/groups/flag/dibas/versions/instances4/exec
\ No newline at end of file

lib

+/home/groups/flag/dibas/versions/instances4/lib
\ No newline at end of file

pulsar

+/home/sandboxes/pmargani/dibas/pulsar/
\ No newline at end of file

versions/instances4/lib/python/BeamformerBackend.py

@@ -581,13 +581,15 @@ class BeamformerBackend(Backend):
             mode_str = "-o COVMODE=PAF_CAL"
             process_list = process_list + mode_str.split()
             # Add threads
-            thread1 = "-c %d flag_net_thread" % (self.core[0])
-            thread2 = "-c %d flag_transpose_thread" % (self.core[1])
-            thread3 = "-c %d flag_correlator_thread" % (self.core[2])
+            #thread1 = "-c %d flag_net_thread" % (self.core[0])
+            #thread2 = "-c %d flag_transpose_thread" % (self.core[1])
+            #thread3 = "-c %d flag_correlator_thread" % (self.core[2])
+            thread1 = "-c %d flag_net_transpose_thread" % (self.core[0])
+            thread2 = "-c %d flag_corr_transpose_thread" % (self.core[2])
             #thread4 = "-c %d flag_corsave_thread" % (self.core[3])
             process_list = process_list + thread1.split()
             process_list = process_list + thread2.split()
-            process_list = process_list + thread3.split()
+            #process_list = process_list + thread3.split()
             #process_list = process_list + thread4.split()
         elif self.name == "correlator_save":
             # Add threads
@@ -636,10 +638,14 @@ class BeamformerBackend(Backend):
             # Save thread
             #thread4 = "-c %d flag_beamsave_thread" % (self.core[3])
 
+	    # Null thread
+	    #thread5 = "-c %d null_output_thread" % (self.core[3])
+
             process_list = process_list + thread1.split()
             process_list = process_list + thread2.split()
             #process_list = process_list + thread3.split()
             #process_list = process_list + thread4.split()
+	    #process_list = process_list + thread5.split()
         elif self.name == "flag_total_power":
             # Add threads
             thread1 = "-c %d flag_net_thread" % (self.core[0])
@@ -688,6 +694,18 @@ class BeamformerBackend(Backend):
             process_list = process_list + thread3.split()
             process_list = process_list + thread4.split()
             #process_list = process_list + thread5.split()
+
+	    # Transpose logic in net thread ####################################
+            #thread1 = "-c %d flag_net_pfb_thread" % (self.core[0])
+            #thread2 = "-c %d flag_pfb2_thread" % (self.core[1])
+            #thread3 = "-c %d flag_pfb_corr_transpose_thread" % (self.core[2])
+            ##################################################################
+
+            #thread5 = "-c %d flag_pfb_corsave_thread" % (self.core[1])
+            #process_list = process_list + thread1.split()
+            #process_list = process_list + thread2.split()
+            #process_list = process_list + thread3.split()
+            #process_list = process_list + thread5.split()
             
 
         print ' '.join(process_list)
@@ -786,6 +804,11 @@ class BeamformerBackend(Backend):
             cmd += " -m s"
         if self.name == 'cal_correlator':
             cmd += " -m c"
+            # Net Transpose -- puts FITS writer on unique cores.
+            if not (self.instance % 2):
+                cmd += " -c %d" % self.core[1]
+            else:
+                cmd += " -c %d" % self.core[3] 
         if self.name == 'frb_correlator':
             cmd += " -m f"
         if self.name == 'pulsar_beamformer':

versions/instances4/lib/python/RC.txt

-0
+1