Changeset 3487 for trunk/MagicSoft/Mars

Timestamp:

03/12/04 16:07:58 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MCerPhotAnal2.cc (modified) (2 diffs)
• mastro/MAstroCamera.cc (modified) (1 diff)
• mastro/MAstroCatalog.cc (modified) (3 diffs)
• mastro/MAstroCatalog.h (modified) (3 diffs)
• mbase/MStatusDisplay.cc (modified) (4 diffs)
• merpp.cc (modified) (4 diffs)
• mfilter/MFCosmics.cc (modified) (2 diffs)
• mhist/MHCamera.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc

@@ -153 +153 @@
         ULong_t sqsb  = 0;   // sum sqares signal+background
 
-        Int_t sat = 0; // saturates?
-        Int_t nb  = 0;
-        Int_t nsb = 0;
+        Int_t sat  = 0; // saturates?
+        Int_t ishi = 0; // has a high content?
+        Int_t nb   = 0;
+        Int_t nsb  = 0;
 
         if (*max==255)
             sat++;
+
+        if (*max>80)
+            ishi++;
 
         while (ptr<end)
@@ -177 +181 @@
         }
 
-        if (sat>1)
+        if (sat==0 && ishi)
+        {
+            // Area: x9
+            ptr = pixel.GetLoGainSamples();
+            max = ptr+pixel.GetIdxMaxLoGainSample();
+            end = ptr+fRawEvt->GetNumLoGainSamples();
+
+            sumb = 0;   // sum background
+            sqb  = 0;   // sum sqares background
+            nb   = 0;
+
+            while (ptr<end)
+            {
+                // Background already calced from hi-gains!
+                sumb += *ptr;
+                sqb  += *ptr* *ptr;
+                nb++;
+            }
+        }
+
+        if (sat>1 && !ishi)
         {
             // Area: x9

trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

@@ -286 +286 @@
         mean *= 1./num;
 
-        DrawStar(mean(1), mean(0), *radec, !hasmean);
+        DrawStar(mean(1), mean(0), *radec, !hasmean, Form("x=%.1fmm y=%.1fmm", mean(1), mean(0)));
     }
 }

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -468 +468 @@
     //        return;
 
-    const Int_t v0x = (int)(v0.X()*TMath::RadToDeg());
-    const Int_t v0y = (int)(v0.Y()*TMath::RadToDeg());
+    //    const Int_t v0x = (int)(v0.X()*TMath::RadToDeg());
+    //    const Int_t v0y = (int)(v0.Y()*TMath::RadToDeg());
 
     Int_t idx[] = {1, 1, 1, 1};
@@ -568 +568 @@
 }
 
-void MAstroCatalog::DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t transparent)
+void MAstroCatalog::DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t transparent, const char *txt)
 {
     const Double_t ra  = v.Phi()*TMath::RadToDeg()/15;
@@ -577 +577 @@
     str += Form("  Dec=%.1fd", dec);
     str += Form("  Mag=%.1f", -2.5*log10(v.Mag()));
+    if (txt)
+        str += Form("  (%s)", txt);
 
     // draw star on the camera display

trunk/MagicSoft/Mars/mastro/MAstroCatalog.h

@@ -87 +87 @@
     Float_t atof(const TString &s);
 
+//#if ROOT_VERSION_CODE < ROOT_VERSION(4,00,03)
     Bool_t fPlainScreen;  //! Just a dummy!!!! ([Set,Is]Freezed)
+//#endif
 
 protected:
@@ -110 +112 @@
     void  Draw(const TVector2 &v0, const TRotation &rot, TArrayI &dx, TArrayI &dy, Int_t stepx, Int_t stepy, Int_t type);
     void  DrawNet(const TVector2 &v0, const TRotation &rot, Int_t type);
-    void  DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t t);
+    void  DrawStar(Double_t x, Double_t y, const TVector3 &v, Bool_t t, const char *txt=0);
     void  Paint(Option_t *o="");
     Int_t DistancetoPrimitive(Int_t px, Int_t py);
@@ -173 +175 @@
     void SetGuiActive(Bool_t b=kTRUE)        { b ? SetBit(kGuiActive) : ResetBit(kGuiActive); }
 
-    void   SetPlainScreen(Bool_t b=kTRUE)    { b ? SetBit(kPlainScreen) : ResetBit(kPlainScreen); Update(); } // *TOGGLE*
+    void   SetPlainScreen(Bool_t b=kTRUE)    { b ? SetBit(kPlainScreen) : ResetBit(kPlainScreen); Update(); } // *TOGGLE* *GETTER=IsPlainScreen
     Bool_t IsPlainScreen() const             { return TestBit(kPlainScreen); }
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1954 +1954 @@
         //
         gPad = n;
+        //n->cd();
 
         //
@@ -1983 +1984 @@
         //
         n->SetBatch(kFALSE);
-        if (num<0)
-            *fLog << "done." << endl;
+        *fLog << "done." << endl;
     }
 
@@ -1994 +1994 @@
     SetStatusLine2("Updating header of PS file...");
 
-    *fLog << inf << " - Updating header of PS file... " << flush;
+    if (num<0)
+        *fLog << " - Updating header of PS file... " << flush;
     UpdatePSHeader(name);
-    *fLog << inf << "done." << endl;
+    if (num<0)
+        *fLog << inf << "done." << endl;
 
     gVirtualPS = psave;
@@ -2002 +2004 @@
         padsav->cd();
 
-    *fLog << inf << "done." << endl;
+    if (num<0)
+        *fLog << inf << "done." << endl;
 
     SetStatusLine2(Form("Done (%dpages)", page-1));

trunk/MagicSoft/Mars/merpp.cc

@@ -61 +61 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << "   merpp [-h] [-?] [-a] [-vn] [-cn] [-u]" << endl;
+    gLog << "   merpp [-h] [-?] [-a] [-vn] [-cn] [-u, -f]" << endl;
     gLog << "         inputfile[.rep,[.raw],[.txt]] [outputfile[.root]]" << endl << endl;
     gLog << "     inputfile.raw:  Magic DAQ binary file." << endl;
@@ -71 +71 @@
     gLog << "     -u, --update                     Update file" << endl;
     gLog << "     -a, --no-colors                  Do not use Ansii color codes" << endl;
+    gLog << "     -f                               Force overwrite of an existing file" << endl;
     gLog << "     --sql=mysql://user:password@url  Insert run into database <raw data only>" << endl;
     gLog << "     --start=yyyy-mm-dd/hh:mm:ss.mmm  Start event time for merpping report files" << endl;
@@ -118 +119 @@
     const Int_t kComprlvl = arg.HasOption("-c") ? arg.GetIntAndRemove("-c") : 1;
     Bool_t kUpdate = arg.HasOnlyAndRemove("--update") || arg.HasOnlyAndRemove("-u");
+    const Bool_t kForce = arg.HasOnlyAndRemove("-f");
 
     gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
@@ -194 +196 @@
     }
 
-    if (fileexist && !kUpdate)
+    if (fileexist && !kUpdate && !kForce)
     {
         gLog << err << "Sorry, file '" << kNameout << "' already existing." << endl;

trunk/MagicSoft/Mars/mfilter/MFCosmics.cc

@@ -167 +167 @@
 
         allpix++;
+
         //
         // We consider a pixel as presumably due to cosmics
@@ -193 +194 @@
     *fLog << " " << setw(7) << fCut[0] << " (" << setw(3) ;
     *fLog << (int)(fCut[0]*100/GetNumExecutions()) ;
-    *fLog << "%) Evts skipped due to: Cosmics Rejection applied " ;
+    *fLog << "%) Detected cosmics " ;
     *fLog << " (with fMaxEmptyPixels = " << fMaxEmptyPixels*100 << "%)" << endl;
 
     *fLog << " " << setw(7) << fCut[1] << " (" << setw(3) ;
     *fLog << (int)(fCut[1]*100/GetNumExecutions()) ;
-    *fLog << "%) Evts survived the cosmics rejection!" << endl;
+    *fLog << "%) No cosmics!" << endl;
     *fLog << endl;
 

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -42 +42 @@
     TList         *fNotify;      //!
 
+//#if ROOT_VERSION_CODE < ROOT_VERSION(4,00,03)
     Bool_t         fFreezed;     //! Just a dummy!!!! ([Set,Is]Freezed)
-
-    //Int_t          fOptStat;
-    //TGStatusBar   *fStatusBar;
+//#endif
 
     void Init();
@@ -202 +201 @@
     void     DisplayAsCamera() { SetDrawOption(""); } // *MENU*
 
-    void     SetFreezed(Bool_t f=kTRUE) { f ? SetBit(kFreezed) : ResetBit(kFreezed); } // *TOGGLE*
+    void     SetFreezed(Bool_t f=kTRUE) { f ? SetBit(kFreezed) : ResetBit(kFreezed); } // *TOGGLE* *GETTER=IsFreezed
     Bool_t   IsFreezed() const { return TestBit(kFreezed); }
     //void  SetOptStat(Int_t os=-1) { fOptStat = os; } // *MENU*