Changeset 18331 for branches

Timestamp:

09/02/15 11:05:56 (9 years ago)

Author:

Jens Buss

Message:

merged master to branch

Location:

branches/MarsGapdTimeJitter

Files:

• . (modified) (1 prop)
• ceres.rc (modified) (2 diffs)
• fact/analysis/callisto.C (modified) (2 diffs)
• fact/processing/buildseqentries.C (modified) (8 diffs)
• fact/processing/camhum.C (copied) (copied from trunk/Mars/fact/processing/camhum.C )
• fact/processing/contemp.C (copied) (copied from trunk/Mars/fact/processing/contemp.C )
• fact/processing/lastth.C (copied) (copied from trunk/Mars/fact/processing/lastth.C )
• fact/processing/threshold.C (copied) (copied from trunk/Mars/fact/processing/threshold.C )
• fact/resources/sequences.rc (modified) (1 diff)
• fact/tools (copied) (copied from trunk/Mars/fact/tools )
• fact/tools/DataFromQLA.C (copied) (copied from trunk/Mars/fact/tools/DataFromQLA.C )
• fact/tools/GetObsTimes.C (copied) (copied from trunk/Mars/fact/tools/GetObsTimes.C )
• fact/tools/produce_drs_time_fits_file.C (copied) (copied from trunk/Mars/fact/tools/produce_drs_time_fits_file.C )
• mimage/MImgCleanTime.cc (modified) (4 diffs)

branches/MarsGapdTimeJitter/ceres.rc

@@ -134 +134 @@
 ConesTransmission.FileName:            resmc/fact/Transmittance_1439Cones_FACT_bearbeitet.txt
 
+# A backward motivated overall PDE adjustment. Introduced by Fabian T. to produce the ICRC2015 Crab spectrum. Fabian, please comment a bit more on this. In case this is only about the additional shielding of our camera support structure, then we schould actually name it like this.
+
+AdditionalPhotonAcceptance.Function.Name:  0.8
+AdditionalPhotonAcceptance.Function.Npx:   100L
+AdditionalPhotonAcceptance.Function.Xmin:  290L
+AdditionalPhotonAcceptance.Function.Xmax:  900L
+
 # -------------------------------------------------------------------------
 # Setup what in MMCS would be called "additional spot size"
@@ -238 +245 @@
 
 ResidualTimeSpread.Val: 0.0
-
 # last line comment

branches/MarsGapdTimeJitter/fact/analysis/callisto.C

@@ -21 +21 @@
 
     MStatusDisplay *d = new MStatusDisplay;
+
+    // ------------------------------------------------------
+
+    // ------------------------------------------------------
+
+    // Calib: 51 / 90 / 197 (20% TH)
+    // Data:  52 / 64 / 104 (20% TH)
+
+    // Extraction range in slices. It will always(!) contain the full range
+    // of integration
+    const int first_slice =  25; //  10ns
+    const int last_slice  = 225; // 125ns
+
+    const double heighttm   = 0.5; // IntegralAbs { 1.5pe * 9.6mV/pe } / IntegralRel { 0.5 }
+
+    Long_t max  =    0;  // All
+    Long_t max0 =  max;  // Time marker
+    Long_t max1 =  max;  // Light pulser
+    //Long_t max2 = 3000;  // Calibration ratio
+    Long_t max3 =  max;  // Pedestal Rndm
+    Long_t max4 =  max;  // Pedestal Ext
+    Long_t max5 =  max;  // Data
+
+    // ========================= Result ==================================
+
+    //double scale = 0.1;
+    double scale = 0.1024;
+
+    // ======================================================
+
+    if (map && gSystem->AccessPathName(map, kFileExists))
+    {
+        gLog << err << "ERROR - Cannot access mapping file '" << map << "'" << endl;
+        return 1;
+    }
+
+    // The sequence file which defines the files for the analysis
+    MSequence seq(seqfile);
+    if (!seq.IsValid())
+    {
+        gLog << err << "ERROR - Sequence '" << seqfile << "' invalid!" << endl;
+        return 2;
+    }
 
     MBadPixelsCam badpixels;
@@ -38 +81 @@
     //    1393
 
-    // ------------------------------------------------------
-
-    // ------------------------------------------------------
-
-    // Calib: 51 / 90 / 197 (20% TH)
-    // Data:  52 / 64 / 104 (20% TH)
-
-    // Extraction range in slices. It will always(!) contain the full range
-    // of integration
-    const int first_slice =  25; //  10ns
-    const int last_slice  = 225; // 125ns
-
-    const double heighttm   = 0.5; // IntegralAbs { 1.5pe * 9.6mV/pe } / IntegralRel { 0.5 }
-
-    Long_t max  =    0;  // All
-    Long_t max0 =  max;  // Time marker
-    Long_t max1 =  max;  // Light pulser
-    //Long_t max2 = 3000;  // Calibration ratio
-    Long_t max3 =  max;  // Pedestal Rndm
-    Long_t max4 =  max;  // Pedestal Ext
-    Long_t max5 =  max;  // Data
-
-    // ========================= Result ==================================
-
-    //double scale = 0.1;
-    double scale = 0.1024;
-
-    // ======================================================
-
-    if (map && gSystem->AccessPathName(map, kFileExists))
-    {
-        gLog << err << "ERROR - Cannot access mapping file '" << map << "'" << endl;
-        return 1;
-    }
-
-    // The sequence file which defines the files for the analysis
-    MSequence seq(seqfile);
-    if (!seq.IsValid())
-    {
-        gLog << err << "ERROR - Sequence '" << seqfile << "' invalid!" << endl;
-        return 2;
+    // broken drs-board:
+    //   https://www.fact-project.org/logbook/showthread.php?tid=3521
+    // in the analysis effect visible 10.1. - 25.5.2015
+    // according to logbook:
+    //   first report of problem:
+    //   https://www.fact-project.org/logbook/showthread.php?tid=2772&pid=15756#pid15756
+    //   repair action:
+    //   https://www.fact-project.org/logbook/showthread.php?tid=3298
+    // affected pixels:
+    //   SW: 1193 1194 1195 1391 1392 1393 1304 1305 1306
+    if (seq.GetNight().GetNightAsInt()>20141114 && seq.GetNight().GetNightAsInt()<20150526)
+    {
+        gLog << "Exclude broken drs-board..." << endl;
+        badpixels[1193].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+        badpixels[1194].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+        badpixels[1195].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+        badpixels[1391].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+        badpixels[1392].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+        badpixels[1393].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+        badpixels[1304].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+        badpixels[1305].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+        badpixels[1306].SetUnsuitable(MBadPixelsPix::kUnsuitable);
     }
 

branches/MarsGapdTimeJitter/fact/processing/buildseqentries.C

@@ -136 +136 @@
         if (arr.GetEntries()>2)
             fMax = GetId(arr[2]->GetName());
+        cout << "----> " << fMin << " " << fMax << endl;
     }
 
@@ -217 +218 @@
         if (run>0)
         {
+            cout << " - - > " << run << endl;
             if (run<fMin || run>fMax)
                 return kFALSE;
@@ -915 +917 @@
     }
 
-    TString PrepareString(TSQLResult &res, TArrayL &runs)
+    TString PrepareString(TSQLResult &res, TArrayL &runs, TArrayL &nights)
     {
         // Number of result rows
@@ -921 +923 @@
 
         runs.Set(rows);       // initialize size of array for run numbers
+        nights.Set(rows);       // initialize size of array for nights
 
         TArrayD start(rows);  // instantiate array for start times
@@ -932 +935 @@
         {
             runs[idx] = atol((*row)[0]);          // run number
+            nights[idx] = atol((*row)[4]);          // night
 
             const TString tstart = ((*row)[2]);   // start time
@@ -1021 +1025 @@
         /*const*/
         TString query =
-            "SELECT fRunID, fRunTypeKEY, fRunStart, fRunStop"
+            "SELECT fRunID, fRunTypeKEY, fRunStart, fRunStop, fNight*1000 "
             " FROM RunInfo WHERE fExcludedFDAKEY=1 AND ";
         query += Form("fRunID BETWEEN %ld AND %ld AND "
@@ -1038 +1042 @@
         // and an array with the corresponding run-numbers
         TArrayL runs;
-        const TString str = PrepareString(*res, runs);
+        TArrayL nights;
+        const TString str = PrepareString(*res, runs, nights);
 
         delete res;
@@ -1071 +1076 @@
             {
                 // Check if regular expressions matchs
-                const Ssiz_t len = obj->Match(str, pos, runs[pos]);
+                const Ssiz_t len = obj->Match(str, pos, nights[pos]);
                 if (len>0)
                 {

branches/MarsGapdTimeJitter/fact/resources/sequences.rc

@@ -225 +225 @@
 BGBB?TU?PP? 0
 PCD+        0
+BGPP?       20150716
+P?D+        20150716
 
 #[bB][gG][bB][bB][tT][pP][pP] 0 20120116

branches/MarsGapdTimeJitter/mimage/MImgCleanTime.cc

@@ -99 +99 @@
     const Float_t time1 = pix1.GetArrivalTime();
 
+    if (pix1.IsPixelUnmapped())
+        return Island(0,time1);
+
     Island island(pix1.GetNumPhotons(), time1);
 
@@ -106 +109 @@
 
         MSignalPix &pix2 = (*fEvt)[idx2];
+        if (pix2.IsPixelUnmapped())
+            continue;
 
         const Int_t island2 = pix2.GetIdxIsland();
@@ -137 +142 @@
 Int_t MImgCleanTime::Process()
 {
-    // The assumption is that all pixels contain valid data
+    // The assumption is that all mapped pixels contain valid data
     const UInt_t npix = fEvt->GetNumPixels();
     for (UInt_t i=0; i<npix; i++)
     {
         MSignalPix &pix = (*fEvt)[i];
-        pix.SetPixelUnused();
+        if (!pix.IsPixelUnmapped())
+            pix.SetPixelUnused();
         pix.SetPixelCore(kFALSE);
         pix.SetIdxIsland(-1);
@@ -182 +188 @@
         // The ideal cut would be to allow that a single
         // pixel still can connect two clusters
-        if (I1.count==1 || I1.count==1)
+        if (I1.count==1 || I2.count==1)
             continue;