now more warnings if ESMD is not in the run, thanks Pibero

star-bnl · Jan 10, 2008 · a5acc06 · a5acc06
1 parent ee84fac
commit a5acc06
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/StRoot/StEmcRawMaker/StEemcRaw.cxx b/StRoot/StEmcRawMaker/StEemcRaw.cxx
@@ -1,4 +1,4 @@
-// $Id: StEemcRaw.cxx,v 1.13 2007/04/11 03:29:11 balewski Exp $
+// $Id: StEemcRaw.cxx,v 1.14 2008/01/10 20:49:58 balewski Exp $
 
 #include <math.h>
 #include <assert.h>
@@ -72,7 +72,7 @@ Bool_t   StEemcRaw::make(StEEMCReader *eeReader, StEvent* mEvent){
     // printf("\nStL0Trigger::token=%d\n",token);
     int runId=mEvent->runId();
 
-    if( headersAreSick(eemcRaw, token,  runId) )
+    if( headersAreSick(eeReader, eemcRaw, token,  runId) )
         return false;
     if (hs[0])
         hs[0]->Fill(3);
@@ -112,7 +112,7 @@ Bool_t   StEemcRaw::copyRawData(StEEMCReader *eeReader, StEmcRawData *raw)
 //____________________________________________________
 //____________________________________________________
 //____________________________________________________
-Bool_t   StEemcRaw::headersAreSick(StEmcRawData *raw, int token, int runId)
+Bool_t   StEemcRaw::headersAreSick(StEEMCReader *eeReader, StEmcRawData *raw, int token, int runId)
 {
 
     if (! raw)
@@ -127,12 +127,20 @@ Bool_t   StEemcRaw::headersAreSick(StEmcRawData *raw, int token, int runId)
     int icr;
     int totErrBit=0;
     int nOn=0;
+
+    LOG_INFO << "StEemcRaw::headersAreSick() --> Nfibers=" << mDb->getNFiber() << endm;
+    LOG_INFO << "StEemcRaw::headersAreSick() --> isEemcBankIn('T')=" << eeReader->isEemcBankIn('T') << endm;
+    LOG_INFO << "StEemcRaw::headersAreSick() --> isEemcBankIn('S')=" << eeReader->isEemcBankIn('S') << endm;
+
     for(icr=0;icr<mDb->getNFiber();icr++)
     {
         const EEmcDbCrate *fiber=mDb-> getFiber(icr);
         if(!fiber->useIt)
             continue; // drop masked out crates
 
+	if (fiber->type == 'T' && !eeReader->isEemcBankIn('T')) continue;
+	if (fiber->type == 'S' && !eeReader->isEemcBankIn('S')) continue;
+
         if(raw->sizeHeader(icr)<=0) {
 	 gMessMgr->Message("","W") <<Form("StEemcRaw::headersAreSick() sizeHeader(icr=%d)<=0,  crID=%d, skip it\n",icr,fiber->crID)<<endm;
 	  continue;  //drop cartes not present in data blocks
@@ -386,6 +394,9 @@ void StEemcRaw::initHisto()
 
 
 // $Log: StEemcRaw.cxx,v $
+// Revision 1.14  2008/01/10 20:49:58  balewski
+// now more warnings if ESMD is not in the run, thanks Pibero
+//
 // Revision 1.13  2007/04/11 03:29:11  balewski
 // undo hacks,
 // Endcap code is now in default configuration

diff --git a/StRoot/StEmcRawMaker/StEemcRaw.h b/StRoot/StEmcRawMaker/StEemcRaw.h
@@ -26,7 +26,7 @@ class StEemcRaw :  public TObject
     StEEmcDbMaker *mDb;
     TH1F *hs[8];
     Bool_t   copyRawData(StEEMCReader *eeReader, StEmcRawData *raw);
-    Bool_t   headersAreSick( StEmcRawData *raw, int token, int runId);
+    Bool_t   headersAreSick(StEEMCReader *eeReader, StEmcRawData *raw, int token, int runId);
     Bool_t   towerDataAreSick(StEmcRawData* raw);
     void     raw2pixels(StEvent* mEvent);
 
@@ -47,10 +47,13 @@ class StEemcRaw :  public TObject
 
 #endif
 
-// $Id: StEemcRaw.h,v 1.4 2006/01/16 11:12:00 suaide Exp $
+// $Id: StEemcRaw.h,v 1.5 2008/01/10 20:49:59 balewski Exp $
 
 /*
  * $Log: StEemcRaw.h,v $
+ * Revision 1.5  2008/01/10 20:49:59  balewski
+ * now more warnings if ESMD is not in the run, thanks Pibero
+ *
  * Revision 1.4  2006/01/16 11:12:00  suaide
  * tower map bug fixed and astyle run
  *