Changeset 7393 for trunk/MagicSoft

Timestamp:

11/11/05 15:02:20 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/buildsequenceentries.C (modified) (1 diff)
• datacenter/scripts/rmlocks (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/11/12 Daniela Dorner
+
+   * datacenter/macros/buildsequenceentries.C:
+     - fixed typo (be careful: due to this typo the values for 
+       L2TriggerTable in the DB and in the sequence files may be wrong)
+
+   * datacenter/scripts/rmlocks:
+     - fixed condition for removing lock-file
+
+
 
  2005/11/10 Thomas Bretz

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

@@ -418 +418 @@
     // ========== Request data of sequence ==========
     query = Form("SELECT fSourceKEY, fProjectKEY, "
-                 " fL1TriggerTableKEY, fL1TriggerTableKEY,"
+                 " fL1TriggerTableKEY, fL2TriggerTableKEY,"
                  " fHvSettingsKEY, fDiscriminatorThresholdTableKEY,"
                  " fTriggerDelayTableKEY, fLightConditionsKEY, fTestFlagKEY"

trunk/MagicSoft/Mars/datacenter/scripts/rmlocks

@@ -34 +34 @@
 for file in ${files[@]}
 do 
-#   echo "file: "$file
-   filedate=`date +%Y%m%d%H -r $file`
-   now=`date +%Y%m%d%H`
-   compdate=`expr $now - 13`
+   filedate=`date +%H -r $file`
+   now=`date +%H`
+   compdate=`expr $now - 13 + 24`
 #   echo "date: "$filedate
 #   echo "now: " $now
 #   echo "comp: " $compdate
-   if [ $compdate -gt $filedate ]
+   twelf=12
+   if [ $compdate -gt $twelf ]
+   then
+      filedate2=`expr $filedate + 24`
+   else 
+      filedate2=$filedate
+   fi
+   if [ $compdate -gt $filedate2 ] || [ $filedate2 -gt $now -a $now -gt $twelf ]
    then 
-#      echo "greater -> remove"
       rm -v $file
+      echo "date:  "$filedate
+      echo "date2: "$filedate2
+      echo "now:   "$now
+      echo "comp:  "$compdate
       date
    fi
 done
 
-
-