Changeset 4387

Timestamp:

07/17/07 12:41:58 (6 years ago)

Author:

DrewCormier

Message:

for new dir structure. assume that DAS file has the same waveform name as the sad file so that list of available waveforms can populate correctly

Files:

• experimental/ALF/trunk/alf/ALF.py (modified) (3 diffs)

experimental/ALF/trunk/alf/ALF.py

@@ -423 +423 @@
                         sad_file = fname
                         full_sad_file = dirpath + "/" + fname
-                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
+                        # 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.strip(".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
+
+
             if (sad_file == None and das_file != None) or (sad_file != None and das_file == None):
                 #errorMsg(self, "Could not find both a SAD file and a DAS in this directory:\n " + dirpath)
@@ -439 +448 @@
                 errorMsg(self, "Conflicting waveform name: " + wavename)
                 continue
-                
+               
             self.availableWaveforms[wavename] = (sad_file, full_sad_file, das_file, full_das_file)
 
@@ -484 +493 @@
         self.domMgr.installApplication(name_SAD)
 
+
+        print name_SAD
+        print absolute_name_SAD
+        print name_DAS
+        print absolute_name_DAS
         
         dasxml = importResource.stripDoctype(absolute_name_DAS)