Changeset 4468

Timestamp:

07/19/07 14:24:36 (6 years ago)

Author:

DrewCormier

Message:

fixed indentation so that I will look for more than one sad file in each directory (e.g., the waveform directory before sud dirs). will now only look in /sdr/dom/waveforms for sadd files instead of all of /sdr

Files:

• experimental/ALF/trunk/alf/ALF.py (modified) (1 diff)

experimental/ALF/trunk/alf/ALF.py

@@ -446 +446 @@
         self.availableWaveforms.clear()
         installRoot = self.installBox.AddRoot("install_root")
-        
-        for dirpath, dirnames, filenames in os.walk(self.installpath):
+
+        for dirpath, dirnames, filenames in os.walk(self.installpath + 
+                                                    "/dom/waveforms"):
             sad_file = None
             das_file = None
             for fname in filenames:
                 if fname.find(".sad.xml") != -1:
-                    # make sure that the '.sad.xml' comes at the end of the file name
+                    # make sure that the '.sad.xml' comes at the end of the 
+                    # file name
                     if fname[-8:] == ".sad.xml":    
                         sad_file = fname
+ 
                         full_sad_file = dirpath + "/" + fname
-                        # for framework > r2983, assume DAS file has the same waveform
-                        # name as the sad file, and assume that both files are in the 
-                        # same directory.  similar to c_wavLoader.
+                        # for framework > r2983, assume DAS file has the same 
+                        # waveform name as the sad file, and assume that both
+                        # files are in the same directory.  similar to 
+                        # c_wavLoader.
                         das_file = fname.replace(".sad.xml", "_DAS.xml")
                         full_das_file = dirpath + "/" + das_file
-
-                # for framework <= r2983:
-                # if fname.find("_DAS.xml") != -1:
-                #     # make sure that the '_DAS.xml' comes at the end of the file name
-                #     if fname[-8:] == "_DAS.xml":    
-                #         das_file = fname
-                #         full_das_file = dirpath + "/" + fname
-           
-            wavename = sad_file[:-8]
-            if self.availableWaveforms.has_key(wavename):
-                errorMsg(self, "Conflicting waveform name: " + wavename)
-                continue
                
-            self.availableWaveforms[wavename] = (sad_file, full_sad_file, das_file, full_das_file)
+                        wavename = sad_file[:-8]
+
+                        if self.availableWaveforms.has_key(wavename):
+                            # if this condition occurs, will leave the current
+                            # directory and continue to the other directories 
+                            # I'm walking aroud in
+                            errorMsg(self, "Conflicting waveform name: " 
+                                     + wavename)
+                            continue
+               
+                        self.availableWaveforms[wavename] = (sad_file, 
+                                                             full_sad_file,
+                                                             das_file, 
+                                                             full_das_file)
 
         # Populate the display at the Domain level