Changeset 7084 for trunk

Timestamp:

05/23/05 11:32:19 (20 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/fillcalib.C (modified) (2 diffs)
• datacenter/macros/fillsignal.C (modified) (1 diff)
• datacenter/macros/fillstar.C (modified) (1 diff)
• datacenter/scripts/fillstar (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/05/23 Daniela Dorner
+
+   * datacenter/scripts/fillstar:
+     - fixed bug in path
+
+   * datacenter/macros/fillstar.C, fillcalib.C, fillsignal.C:
+     - added check
+
+
+
  2005/05/20 Thomas Bretz
 

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

@@ -109 +109 @@
 
     TFile file(fname, "READ");
+    if (!file.IsOpen())
+    {
+        cout << "ERROR - Could not find file " << fname << endl;
+        return 0;
+    }
+
     if (badpix.Read("MBadPixelsCam")<=0)
     {
@@ -239 +245 @@
                      " fIsolatedInner=%d, "
                      " fIsolatedOuter=%d, "
-                     " fIsolatedMaxCluster=%d, ",
+                     " fIsolatedMaxCluster=%d, "
                      " fArrTimeMeanInner=%s, "
                      " fArrTimeRmsInner=%s, "

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

@@ -70 +70 @@
 {
     TFile file(fname, "READ");
+    if (!file.IsOpen())
+    {
+        cout << "ERROR - Could not find file " << fname << endl;
+        return 0;
+    }
+
     MStatusArray *arr = (MStatusArray*)file.Get("MStatusDisplay");
     if (!arr)

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

@@ -89 +89 @@
 {
     TFile file(fname, "READ");
+    if (!file.IsOpen())
+    {
+        cout << "ERROR - Could not find file " << fname << endl;
+        return 0;
+    }
+
 
     MStatusArray arr;

trunk/MagicSoft/Mars/datacenter/scripts/fillstar

@@ -104 +104 @@
 for sequence in ${sequences[@]}
 do 
-   no=`printf %08d $sequence | cut -c 4`
+   no=`printf %08d $sequence | cut -c 0-4`
    no2=`printf %08d $sequence`
    path="/magic/data/star/$no/$no2"
@@ -136 +136 @@
              fi
            fi
-           setstatuslog=$setstatuslogpath/setstatus-fillstar
-           check4=`root -q -b $macrospath/setstatus.C+\("\"$sequence\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog-$sequence.log | grep int | sed -e 's/(int)//'`
+           setstatuslog=$setstatuslogpath/setstatus-fillstar-$no2.log
+           check4=`root -q -b $macrospath/setstatus.C+\("\"$sequence\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog | grep int | sed -e 's/(int)//'`
            case $check4 in
              1)   echo "check4=$check4 -> everthing ok, status has been set" >> $scriptlog 2>&1;;