Changeset 3888 in Sophya for trunk/AddOn/TAcq/brproc.cc

Timestamp:

Sep 24, 2010, 2:01:47 PM (15 years ago)

Author:

ansari

Message:

Introduction correction de gain/reponse filtre et amelioration n-tuple ds BRMeanSpecCalculator, Reza+JEC 24/09/2010

File:

• trunk/AddOn/TAcq/brproc.cc (modified) (5 diffs)

trunk/AddOn/TAcq/brproc.cc

@@ -47 +47 @@
     mspecmtx_.SetSize(memgr_.NbFibres(), paq.DataSize()/2); 
     sigspecmtx_.SetSize(memgr_.NbFibres(), paq.DataSize()/2); 
+    sgain_.SetSize(memgr_.NbFibres(), paq.DataSize()/2); 
   }
   else {
     mspecmtx_.SetSize(2*memgr_.NbFibres(), paq.DataSize()/4); 
     sigspecmtx_.SetSize(2*memgr_.NbFibres(), paq.DataSize()/4); 
+    sgain_.SetSize(2*memgr_.NbFibres(), paq.DataSize()/4); 
   }
   mspecmtx_=(r_4)(0.);
   sigspecmtx_=(r_4)(0.);
+  sgain_=(r_4)(1.);    // Gain en fonction de la frequence, à 1 par defaut 
+
   numfile_=0;
   nbpaq4mean_=0;
@@ -71 +75 @@
     dtp_->AddFloatColumn(cnom);    
   }
-  xnt_=new double[nchan];
+  for(int i=0; i<nchan; i++) {
+    sprintf(cnom,"varnorm%d",i);
+    dtp_->AddFloatColumn(cnom);    
+  }
+  xnt_=new double[nchan*2];
 }
 
@@ -91 +99 @@
 }
 
+/* --Methode-- */
+void BRMeanSpecCalculator::ReadGainFitsFile(string filename)
+{
+  cout << " BRMeanSpecCalculator::ReadGainFitsFile() - reading file " << filename;
+  FitsInOutFile fis(filename, FitsInOutFile::Fits_RO);
+  fis >> sgain_;
+  cout << " MeanGain=" << sgain_.Sum()/sgain_.Size() << endl;
+}
 
 static inline r_4 Zmod2(complex<r_4> z) 
@@ -159 +175 @@
       }
       double variance=0.;
-      for(sa_size_t f=1; f<mspecmtx_.NCols(); f++)   variance+=(double)zp[f].module2F();
+      double varnorm=0.;
+      for(sa_size_t f=1; f<mspecmtx_.NCols(); f++) {
+        double modsq=(double)zp[f].module2F();
+        variance+=modsq;
+        varnorm+=modsq/sgain_(i,f);
+      }
       xnt_[i]=variance;
+      xnt_[i+mspecmtx_.NRows()]=varnorm;
       clnflg_[i]=0;
-      if (variance<varmin_) clnflg_[i]=1;
-      else if (variance>varmax_) clnflg_[i]=2;
+      if (varnorm<varmin_) clnflg_[i]=1;
+      else if (varnorm>varmax_) clnflg_[i]=2;
     }
   }
@@ -177 +199 @@
       }
       double variance=0.;
-      for(sa_size_t f=1; f<mspecmtx_.NCols(); f++)   variance+=(double)Zmod2(zp[f]);
+      double varnorm=0.;
+      for(sa_size_t f=1; f<mspecmtx_.NCols(); f++) {
+        double modsq=(double)Zmod2(zp[f]);
+        variance+=modsq;
+        varnorm+=modsq/sgain_(i,f);
+      }
       xnt_[i]=variance;
+      xnt_[i+mspecmtx_.NRows()]=varnorm;
       clnflg_[i]=0;
-      if (variance<varmin_) clnflg_[i]=1;
-      else if (variance>varmax_) clnflg_[i]=2;     
+      if (varnorm<varmin_) clnflg_[i]=1;
+      else if (varnorm>varmax_) clnflg_[i]=2;
     }
   }