Changeset 7393 for trunk/MagicSoft/Mars/datacenter

Timestamp:

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

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter

Files:

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

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
 
-
-