Changeset 8010 for trunk

Timestamp:

10/07/06 09:41:15 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/buildsequenceentries.C (modified) (3 diffs)
• resources/sequences.rc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
- 2006/10/07 Daniela Dorner
+ 2006/10/07 Daniela Dorner, Thomas Bretz
 
    * datacenter/scripts/runganymed:
      - added sequencepath to ganymed command
+
+   * datacenter/macros/buildsequenceentries.C:
+     - restricted regular expression for wobble sources
+     - fixed bug (larger sequences were misinterpreted as identical 
+       sequences)
+
+   * resources/sequences.rc:
+     - added 2 regions were interleaved pedestal run are allowed
 
 

trunk/MagicSoft/Mars/datacenter/macros/buildsequenceentries.C

@@ -505 +505 @@
             TSQLRow *row=res->Next();
             const Int_t check = CheckSequence(runstart, runstop);
-            if (check==kFALSE)
+            if (check==kTRUE)
             {
                 cout << "     - Identical sequence already existing." << endl;
@@ -1072 +1072 @@
         if (!resx)
             return 2;
-        TString elts = GetELT("Source", resx, "\\-*W[1-9][ abc]*$");
+        TString elts = GetELT("Source", resx, "\\-?W[1-9][ abc]?$");
         delete resx;
 
@@ -1084 +1084 @@
 
         TList regexp;
-        regexp.Add(new TObjString("\\-*W[1-9][abc]?$"));
+        regexp.Add(new TObjString("\\-?W[1-9][abc]?$"));
         regexp.Add(new TObjString("\\-W[0-9]\\.[0-9][0-9]\\+[0-9][0-9][0-9]$"));
         TString eltp2 = GetELT("Project", resx, regexp);

trunk/MagicSoft/Mars/resources/sequences.rc

@@ -203 +203 @@
 #[dD]*[pP]C+(([pP]+[dD])|[dD])+       46478 53943
 [dD]*[pP]C+[pPdD]*[dD]                46478 53943
+[dD]*[pP]C+[pPdD]*[dD]                56567 57786
+[dD]*[pP]C+[pPdD]*[dD]                60145 60396
 
 # Use the minimum solution for newest date