Changeset 14931 for trunk/Mars

Timestamp:

02/15/13 21:02:04 (12 years ago)

Author:

tbretz

Message:

Write file numbers instead of run-numbers as it is in the real files -- still the NIGHT keyword is wrong.

File:

• trunk/Mars/mdrs/MHDrsCalibration.cc (modified) (6 diffs)

trunk/Mars/mdrs/MHDrsCalibration.cc

@@ -286 +286 @@
         // Scale ADC data from 12bit to 2000mV
         fData.GetSampleStats(fBuffer.data()+4, 2000./4096);
-        reinterpret_cast<uint32_t*>(fBuffer.data())[1] = fRun->GetRunNumber();
+        reinterpret_cast<uint32_t*>(fBuffer.data())[1] = fRun->GetFileNumber();
     }
 
@@ -308 +308 @@
         // Scale ADC data from 12bit to 2000mV
         fData.GetSampleStats(fBuffer.data()+1024*1440*2+4, 2000./4096/fResult->fNumOffset);//0.5);
-        reinterpret_cast<uint32_t*>(fBuffer.data())[2] = fRun->GetRunNumber();
+        reinterpret_cast<uint32_t*>(fBuffer.data())[2] = fRun->GetFileNumber();
     }
 
@@ -315 +315 @@
     {
         fResult->fNumTrgOff = fData.GetNumEntries();//*fResult->fNumCellOffset;
+
+        const vector<int64_t> &sum = fData.GetSum();
         if (!CopyData(fResult->fTrgOff))
             return kFALSE;
@@ -322 +324 @@
         fData.GetSampleStats(fBuffer.data()+1024*1440*4+4, 2000./4096/fResult->fNumOffset);//0.5);
         reinterpret_cast<uint32_t*>(fBuffer.data())[0] = fNumSamples;
-        reinterpret_cast<uint32_t*>(fBuffer.data())[3] = fRun->GetRunNumber();
+        reinterpret_cast<uint32_t*>(fBuffer.data())[3] = fRun->GetFileNumber();
     }
 
@@ -333 +335 @@
 
     const std::string fname(Form("%s/%d_%03d.drs.fits", fOutputPath.Data(),
-                                 fRun->GetRunStart().GetNightAsInt(), fRun->GetFileNumber()));
+                                 fRun->GetRunNumber(), fRun->GetFileNumber()));
 
     const Bool_t exists = !gSystem->AccessPathName(fname.c_str(), kFileExists);
@@ -342 +344 @@
     }
 
-    std::string msg = fResult->WriteFitsImp(fname, fBuffer);
+    const std::string msg = fResult->WriteFitsImp(fname, fBuffer);
 
     if (msg.empty())