Changeset 18278 for branches/MarsWobble/fact/processing

Timestamp:

08/18/15 10:09:13 (10 years ago)

Author:

ftemme

Message:

Merging trunk into MarsWobble branch

Location:

branches/MarsWobble/fact/processing

Files:

• drstemp.C (modified) (1 diff)
• fillratescan.C (modified) (4 diffs)

branches/MarsWobble/fact/processing/drstemp.C

@@ -163 +163 @@
 
     float temp[160];
-    if (file.SetPtrAddress("temp", temp, 82))
-    {
-        drstemp82(file, beg, end);
-        return;
-    }
+//    if (file.SetPtrAddress("temp", temp, 82))
+//    {
+//        drstemp82(file, beg, end);
+//        return;
+//    }
 
     file.SetPtrAddress("temp", temp, 160);

branches/MarsWobble/fact/processing/fillratescan.C

@@ -48 +48 @@
 Float_t GetOffset(TString fname, Double_t beg, Double_t end)
 {
-    fname.ReplaceAll("RATE_SCAN_DATA", "FEEDBACK_DEVIATION");
+    if (end < 15937)
+        fname.ReplaceAll("RATE_SCAN_DATA", "FEEDBACK_DEVIATION");
+    else
+        fname.ReplaceAll("RATE_SCAN_DATA", "FEEDBACK_CALIBRATED_CURRENTS");
 
     fits file(fname.Data());
@@ -61 +64 @@
         return -100;
 
-    if (!file.SetPtrAddress("DeltaUser", &delta))
-        return -100;
+    if (end < 15937)
+    {
+        if (!file.SetPtrAddress("DeltaUser", &delta))
+            return -100;
+    }
+    else
+    {
+        if (!file.SetPtrAddress("U_nom", &delta))
+            return -100;
+    }
 
     //cout << "Search for: " << beg-15773 << " " << end-15773 << endl;
@@ -80 +91 @@
 Float_t GetCurrent(TString fname, Double_t beg, Double_t end)
 {
-    fname.ReplaceAll("RATE_SCAN_DATA", "CALIBRATED_CURRENTS");
-    fname = gSystem->BaseName(fname.Data());
-
-    fname.Prepend("/scratch_nfs/calibrated_currents/");
+    fname.ReplaceAll("RATE_SCAN_DATA", "FEEDBACK_CALIBRATED_CURRENTS");
+
+    //the next two lines are needed for ISDC and data before 11.3.2013
+    //fname.ReplaceAll("RATE_SCAN_DATA", "CALIBRATED_CURRENTS");
+    //fname = gSystem->BaseName(fname.Data());
+    //fname.Prepend("/scratch_nfs/calibrated_currents/");
 
     fits file(fname.Data());
@@ -326 +339 @@
         !file.SetPtrAddress(string(old ? "Data3" : "RelOnTime"), &ontime))
         return -1;
-    */
+        */
     Double_t  *ptime   = file.SetPtrAddress("Time");
     ULong64_t *pid     = file.SetPtrAddress(old ? "Data0" : "Id");