Changeset 4075 for trunk/MagicSoft/Mars

Timestamp:

05/14/04 17:41:08 (20 years ago)

Author:

jlopez

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• library/MCalibrateDC.cc (modified) (3 diffs)
• library/MCalibrateDC.h (modified) (1 diff)
• library/MPSFFitCalc.cc (modified) (1 diff)
• macros/findstars.C (modified) (3 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/library/MCalibrateDC.cc

@@ -51 +51 @@
 using namespace std;
 
-MCalibrateDC::MCalibrateDC(TString filename, const char *name, const char *title)
+MCalibrateDC::MCalibrateDC(TString filename, const char *name, const char *title) : fMinDCAllowed(0.5) //[ua]
 {
   fName  = name  ? name  : "MCalibrateDC";
@@ -116 +116 @@
         DCCalibrationCalc();
  
+        UInt_t numPixelsSetUnsuedForDC = 0;
+        
         for (UInt_t pix=1; pix<fNumPixels; pix++)
-          fDCCalibrationFactor[pix] = fDCCalibration/fDisplay[pix];
-
+          {
+            if (fDisplay.GetBinContent(pix+1) > fMinDCAllowed)
+              fDCCalibrationFactor[pix] = fDCCalibration/fDisplay.GetBinContent(pix+1);
+            else
+              {
+                numPixelsSetUnsuedForDC++;
+                fDCCalibrationFactor[pix] = 0.; //FIXME: Maybe to introduce a setunused in MCameraDC ?
+              }
+          }
+
+        *fLog << inf << GetName() << " set unused " << numPixelsSetUnsuedForDC << " because too low dc." << endl;
+        
       }
 
@@ -193 +205 @@
     UInt_t numexecutions = read.GetNumExecutions();
     UInt_t numPixels = fDisplay.GetNumPixels();
-    for (UInt_t pix = 1; pix < numPixels; pix++)
+    for (UInt_t pix = 1; pix <= numPixels; pix++)
       fDisplay[pix] /= numexecutions;
     

trunk/MagicSoft/Mars/mtemp/mifae/library/MCalibrateDC.h

@@ -43 +43 @@
     MHCamera fDisplay;
 
+    const Double_t fMinDCAllowed;
+    
     UInt_t fNumPixels ;
-    TArrayD fDCCalibrationFactor;
+    TArrayD  fDCCalibrationFactor;
     Double_t fDCMissCalibrationFactor;
     

trunk/MagicSoft/Mars/mtemp/mifae/library/MPSFFitCalc.cc

@@ -53 +53 @@
 const Float_t sqrt2 = sqrt(2.);
 const Float_t sqrt3 = sqrt(3.);
-const Bool_t usePrintOut = kFALSE;
-const Int_t minuitPrintOut = -1;
+const Bool_t usePrintOut = kTRUE;
+const Int_t minuitPrintOut = 0;
 
 UInt_t  numPixels;

trunk/MagicSoft/Mars/mtemp/mifae/macros/findstars.C

@@ -85 +85 @@
   dccal.SetFileName(continuoslightfile);
   
+
   const Int_t numblind = 12;
   const Short_t x[numblind] = {  8,  27,
@@ -90 +91 @@
                                543, 559, 560, 561, 567};
   const TArrayS blindpixels(numblind,(Short_t*)x);
-  MFindStars findstars;
-  findstars.SetBlindPixels(blindpixels);
   Float_t ringinterest = 100; //[mm]
   Float_t tailcut = 3.5;
   UInt_t integratedevents = 10;
+
+  MFindStars findstars;
+  //  findstars.SetBlindPixels(blindpixels);
   findstars.SetRingInterest(ringinterest);
   findstars.SetDCTailCut(tailcut);
@@ -131 +133 @@
           return;
       
-       MHCamera display0(geomcam);
-       display0.SetPrettyPalette();
-       display0.Draw();
-//        display0.SetCamContent(dccal.GetDisplay());
-       display0.SetCamContent(dccal.GetDCCalibrationFactor());
-       gPad->Modified();
-       gPad->Update();
+//        MHCamera display0(geomcam);
+//        display0.SetPrettyPalette();
+//        display0.Draw();
+//        //       display0.SetCamContent(dccal.GetDisplay());
+//        display0.SetCamContent(dccal.GetDCCalibrationFactor());
+//        gPad->Modified();
+//        gPad->Update();
 
-       // Remove the comments if you want to go through the file
-       // event-by-event:
-       if (!HandleInput())
-         break;
+//        // Remove the comments if you want to go through the file
+//        // event-by-event:
+//        if (!HandleInput())
+//          break;
 
        MHCamera display(geomcam);